Adds opencascade as an optional dependency #1441

kennyweiss · 2024-10-08T21:05:46Z

Summary

This PR is a feature
It adds opencascade as an optional axom dependency
We're planning to use this mainly to import mesh formats, such as STEP files
It also fixes support on Windows for 32-bit configurations w/ RAJA@2024.07+, including a fix from @adayton1 (Builtin atomic fixes for 32 bit windows RAJA#1746) and using 32-bit Word types in slam::BitSet for these configurations.

TODO

Add Windows support through vcpkg
Enable this in at least one CI plan
Update documentation

kennyweiss · 2024-10-11T23:28:27Z

/style

kennyweiss · 2024-10-15T05:14:28Z

host-configs/rzwhippet-toss_4_x86_64_ib-clang@14.0.6.cmake

-set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.07.0-4bdhkgxmckkcfnhfv76gutbzn7gzrcum" CACHE PATH "")
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-2024.07.0-et2uff5thiprgch43uftatndduzssxay" CACHE PATH "")
+
+set(OPENCASCADE_DIR "${TPL_ROOT}/opencascade-7.8.1-epyyoyevoozkzqoxdqxku2q4anwlqw52" CACHE PATH "")


I tested configs on all platforms w/ opencascade, but only enabled it on a single toss4 config on LC.
I also enabled opencascade in Windows configs.

kennyweiss · 2024-10-15T05:16:13Z

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

+      buildable: False
+      externals:
+      - spec: mesa@18.3.4  # found via: glxinfo | grep -i version
+        prefix: /


@white238 -- the opengl and X libraries were in /lib64 on toss4_cray and blueos, so I made the prefix / instead of /usr. Is that the correct prefix? I tested this w/ one of our blueos configs and it worked.

Wierd but correct? /shrug

kennyweiss · 2024-10-15T05:18:35Z

scripts/vcpkg_ports/opencascade/portfile.cmake

+### BEGIN AXOM PATCH
+
+# replace a quoted number in a flag -- /wd"26812" with /wd26812
+set(_file "${SOURCE_PATH}/adm/cmake/occt_defs_flags.cmake")
+file(READ "${_file}" _filedata)
+string(REPLACE [[/wd\"26812\"]] [[/wd26812]] _filedata "${_filedata}")
+file(WRITE "${_file}" "${_filedata}")
+### END AXOM PATCH


Note: I had to copy the whole opencascade portfile to add this patch, which converts /wd"26812" to /wd26812

kennyweiss · 2024-10-15T05:21:24Z

scripts/vcpkg_ports/opencascade/vcpkg.json

+      "host": true
+    }
+  ],
+  "default-features": [],


Note: I copied the opencascade portfile from vcpkg to remove the freetype default-feature.
More direct ways to do this would involve updates to uberenv to have a project package file.

Compare to:
https://github.com/microsoft/vcpkg/blob/98ffd29b9e6a07db04a0899d1be351e9e3bd1e54/ports/opencascade/vcpkg.json#L27-L32

kennyweiss · 2024-10-15T05:23:07Z

scripts/vcpkg_ports/raja/portfile.cmake

+    REF 85c58eb7d25ac5a7ff1c6a3cc6bb74bf8351e36e # HEAD of bugfix/dayton8/win32 branch; a bit past v2024.07.0
+    SHA512 263346ff91c17f48fa40efdd6826331e1fecb995fef289bf997500d058c57e4dc706512baa8fc5dfc912c54939b973c56c8677a4705e261a2740c55851446341


Note: This points to @adayton1's bugfix commit -- LLNL/RAJA#1746

I can update it to the current HEAD of raja@develop now that the PR is merged (or leave it as is).

I'm OK with either. If users need this, I can tag a patch release for RAJA because Mike C. won't build any TPL sets that don't point at releases.

Please let me know if I should do a RAJA release.

Thanks, but I don't think it's necessary.

Axom's only using this on Windows within our custom vcpkg port for RAJA, so I think it's ok to use a custom commit a bit past the RAJA release.

kennyweiss · 2024-10-15T05:24:54Z

src/axom/quest/detail/PointFinder.hpp

@@ -351,6 +352,11 @@ class PointFinder
    return m_cellBBoxes[cellIdx];
  }

+  std::vector<IndexType> getCandidates(SpacePoint const& pt) const
+  {
+    return m_grid.getCandidatesAsArray(pt);


Note: ImplicitGrid returns a std::vector for its getCandidatesAsArray. We should probably change this to an axom::Array so it's amenable w/ usage on a device.

kennyweiss · 2024-10-15T05:25:47Z

src/axom/slam/BitSet.hpp

+#if(defined(__x86_64__) && defined(__GNUC__)) || \
+  (defined(_WIN64) && (_MSC_VER >= 1600))
  using Word = std::uint64_t;
+#else
+  using Word = std::uint32_t;
+#endif


Note: BitSet now uses 32-bit words in x86 mode on windows.

kennyweiss · 2024-10-15T05:26:39Z

src/axom/spin/ImplicitGrid.hpp

+    const int numBits =
+      axom::utilities::min(bitsPerWord, nbits - (iword * bitsPerWord));


Note: I lost way too much time trying to track down this bug! It hardcoded 64-bit words for the underlying slam::BitSet!

agcapps · 2024-10-17T21:58:40Z

Thank you for this work, @kennyweiss . So far it looks good. What docs do you plan to add?

kennyweiss · 2024-10-21T16:07:29Z

Thank you for this work, @kennyweiss . So far it looks good. What docs do you plan to add?

Thanks @agcapps -- I am planning to add a line to mention opencascade as an optional dependency and mention how to set it up w/ the OPENCASCADE_DIR config variable. I'll take care of it today.

Edit: Done

Only currently tested on LLNL's toss4.

Misc: Fixes typo in comments about exported targets

Includes a test for reading and writing STEP files.

I am not sure why this has not shown up previously.

I had to copy the opencascade port files from vcpkg to * remove the default-dependency on freetype * patch a typo where a number was being quoted in a CMake file

Patch is from A. Dayton and is slightly past raja@2024.07.0

…ed with a query point

The candidates are currently returned as a std::vector. Misc: Uses locales to improve output of these tests.

…nt on LC

…n LC

kennyweiss changed the title ~~pwdFeature/kweiss/optional opencascade dep~~ Adds opencascade as an optional dependency Oct 8, 2024

kennyweiss marked this pull request as draft October 8, 2024 21:08

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from f5c930e to ba9bf06 Compare October 11, 2024 23:27

kennyweiss mentioned this pull request Oct 14, 2024

Builtin atomic fixes for 32 bit windows LLNL/RAJA#1746

Merged

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from 27552e8 to 4d1304e Compare October 15, 2024 04:11

kennyweiss marked this pull request as ready for review October 15, 2024 04:11

kennyweiss self-assigned this Oct 15, 2024

kennyweiss requested review from rhornung67, agcapps, publixsubfan, white238, cyrush, wnissen, BradWhitlock, jcs15c and bmhan12 October 15, 2024 04:12

kennyweiss added TPL Issues related to Axom's third party libraries Build system Issues related to Axom's build system labels Oct 15, 2024

kennyweiss commented Oct 15, 2024

View reviewed changes

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from 1b1cb8f to f3c40d5 Compare October 28, 2024 16:55

white238 approved these changes Nov 4, 2024

View reviewed changes

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch 2 times, most recently from 9ff3b07 to c4b9e1a Compare November 6, 2024 16:43

kennyweiss and others added 24 commits November 6, 2024 09:31

Adds optional opencascade support to axom's spack setup

d8eabf0

Only currently tested on LLNL's toss4.

Import opencascade target when OPENCASCADE_DIR is provided

2c2cb9c

Adds AXOM_USE_OPENCASCADE to config.hpp and CMake export set

aec13ff

Misc: Fixes typo in comments about exported targets

Adds a smoke test for optional opencascade dependency

61148ac

Includes a test for reading and writing STEP files.

Fixes MSVC compilation error related to wide strings

3a90e6a

I am not sure why this has not shown up previously.

vcpkg: Adds optional dependency on opencascade

f8f0560

I had to copy the opencascade port files from vcpkg to * remove the default-dependency on freetype * patch a typo where a number was being quoted in a CMake file

vcpkg: Use patched RAJA branch fixing intrinsics for x86 configs

b789bde

Patch is from A. Dayton and is slightly past raja@2024.07.0

Use 32-bit words for BitSet in x86 mode

cba7c03

Adds missing slam::BitSet tests for atomic update operations

a03c325

Bugfix to ImplicitGrid when using 32-bit Words in BitSet

2a8eb70

Adds function to quest::PointFinder to return the candidates associat…

e821974

…ed with a query point

Improves testing of quest PointInCell functionality

3c1d63b

Apply style updates

1a53c36

Fixes usage of templated type from parent in point in cell tests

e50e3f4

For point in cell tests, only check candidates when running on host

c514b2c

The candidates are currently returned as a std::vector. Misc: Uses locales to improve output of these tests.

Enables opencascade variant in Axom's toss4-clang configuration on LC

622ba59

Updates toss4 host-configs for rzwhippet

113fe63

Adds spack externals for opencascade deps to the toss4_cray environme…

289fb6b

…nt on LC

Adds spack externals for opencascade deps to the blueos environment o…

9a3930d

…n LC

Mentions OPENCASCADE_DIR in Axom's configuration docs

de127e6

clean up -- removes unncessary comments

de618f7

Updates RELEASE-NOTES

79fa865

Apply PR suggesion about includes

8b5bfe0

Applies PR suggestion

24fa8c7

kennyweiss force-pushed the feature/kweiss/optional-opencascade-dep branch from c4b9e1a to 24fa8c7 Compare November 6, 2024 17:31

kennyweiss merged commit f650825 into develop Nov 6, 2024
13 checks passed

kennyweiss deleted the feature/kweiss/optional-opencascade-dep branch November 6, 2024 21:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds opencascade as an optional dependency #1441

Adds opencascade as an optional dependency #1441

kennyweiss commented Oct 8, 2024 •

edited

Loading

kennyweiss commented Oct 11, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024 •

edited

Loading

white238 Nov 4, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

rhornung67 Oct 15, 2024 •

edited

Loading

kennyweiss Nov 4, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

kennyweiss Oct 15, 2024

agcapps commented Oct 17, 2024

kennyweiss commented Oct 21, 2024 •

edited

Loading

		REF 85c58eb7d25ac5a7ff1c6a3cc6bb74bf8351e36e # HEAD of bugfix/dayton8/win32 branch; a bit past v2024.07.0
		SHA512 263346ff91c17f48fa40efdd6826331e1fecb995fef289bf997500d058c57e4dc706512baa8fc5dfc912c54939b973c56c8677a4705e261a2740c55851446341

		const int numBits =
		axom::utilities::min(bitsPerWord, nbits - (iword * bitsPerWord));

Adds opencascade as an optional dependency #1441

Adds opencascade as an optional dependency #1441

Conversation

kennyweiss commented Oct 8, 2024 • edited Loading

Summary

TODO

kennyweiss commented Oct 11, 2024

Choose a reason for hiding this comment

kennyweiss Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhornung67 Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agcapps commented Oct 17, 2024

kennyweiss commented Oct 21, 2024 • edited Loading

kennyweiss commented Oct 8, 2024 •

edited

Loading

kennyweiss Oct 15, 2024 •

edited

Loading

rhornung67 Oct 15, 2024 •

edited

Loading

kennyweiss commented Oct 21, 2024 •

edited

Loading