Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish removing Imath include #4371

Merged
merged 1 commit into from
Aug 11, 2024

Conversation

ThiagoIze
Copy link
Collaborator

lgritz@4cb956b lost this removal when resolving a merge conflict. This properly removes it.

Signed-off-by: Thiago Ize

Description

#4076 implemented matrix44::inverse() so that we could stop including Imath.h. It removed the Imath.h include in the master/dev-2.6 branch but the dev-2.5 branch kept the include, likely because of an improperly resolved merge conflict. This PR removes the include like in master.

Tests

No tests are needed. As long as it compiles, this should be good. I verified this builds on arm64.

Checklist:

  • I have read the contribution guidelines.
  • I have updated the documentation, if applicable.
  • I have ensured that the change is tested somewhere in the testsuite
    (adding new test cases if necessary).
  • If I added or modified a C++ API call, I have also amended the
    corresponding Python bindings (and if altering ImageBufAlgo functions, also
    exposed the new functionality as oiiotool options).
  • My code follows the prevailing code style of this project. If I haven't
    already run clang-format before submitting, I definitely will look at the CI
    test that runs clang-format and fix anything that it highlights as being
    nonconforming.

@ThiagoIze ThiagoIze requested a review from lgritz August 11, 2024 02:01
Copy link

linux-foundation-easycla bot commented Aug 11, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: ThiagoIze / name: Thiago Ize (3c9ed7b)

@lgritz
Copy link
Collaborator

lgritz commented Aug 11, 2024

@ThiagoIze Can you please add the DCO to the commit and make sure it uses the email under which you have your CLA registered? Should look like this:

$ git commit --amend -s --author="Thiago Ize <correct email>"
$ git push origin Imath-include --force

Don't mind the MacOS failure, that's something unrelated that we're seeing on 2.5 generally (but not master, interestingly). I haven't had a chance to track it down yet.

lgritz@4cb956b lost this removal when resolving a merge conflict. This properly removes it.

Signed-off-by: Thiago Ize <[email protected]>
@ThiagoIze
Copy link
Collaborator Author

ThiagoIze commented Aug 11, 2024

Don't mind the MacOS failure, that's something unrelated that we're seeing on 2.5 generally (but not master, interestingly). I haven't had a chance to track it down yet.

I haven't tried it, but I bet if you backported 68666db it would fix the unit test fail. Specifically this change:

-    OIIO_CHECK_SIMD_EQUAL (fast_exp(A),
-                mkvec<VEC>(fast_exp(A[0]), fast_exp(A[1]), fast_exp(A[2]), fast_exp(A[3])));
+   OIIO_CHECK_SIMD_EQUAL_THRESH (fast_exp(A),
+                mkvec<VEC>(fast_exp(A[0]), fast_exp(A[1]), fast_exp(A[2]), fast_exp(A[3])), 1e-5f);

@lgritz lgritz merged commit 857b2a9 into AcademySoftwareFoundation:dev-2.5 Aug 11, 2024
26 of 27 checks passed
@ThiagoIze ThiagoIze deleted the Imath-include branch August 11, 2024 21:43
@lgritz
Copy link
Collaborator

lgritz commented Aug 11, 2024

I will try backporting those lines and see if it addreses the problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants