Skip to content

HDF5 Build Hack Resolved #1036

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+1 −44
Open

HDF5 Build Hack Resolved #1036

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fcc5d1
removed custom FindHDF5.cmake as ig it has been fixed already
Nov 10, 2025
77402d8
changed silo repo to Silo-mo2
Nov 10, 2025
a0771d3
Merge branch 'master' into HDF5-build
Malmahrouqi3 Nov 11, 2025
21c211c
restored Silo repo to LLNL/Silo
Nov 11, 2025
a084ebc
Merge branch 'master' into HDF5-build
Malmahrouqi3 Nov 12, 2025
11dabb1
Use main branch instead of master
Malmahrouqi3 Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ find_program(FYPP_EXE fypp REQUIRED)
link_libraries("${CMAKE_DL_LIBS}")
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/regular")
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/cce")
endif()


# Compiler Flags: Here, we specify our own compiler flags for both release and
# debug builds. These include optimization and debug flags, as well as some that
Expand Down
39 changes: 0 additions & 39 deletions toolchain/cmake/cce/FindHDF5.cmake
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion toolchain/dependencies/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ if (MFC_SILO)

ExternalProject_Add(silo
GIT_REPOSITORY "https://github.com/LLNL/Silo"
GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4
GIT_PROGRESS ON
PATCH_COMMAND "${GIT_EXECUTABLE}" stash
&& "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"
Comment on lines 83 to 88
Copy link
Contributor

@qodo-merge-pro qodo-merge-pro bot Nov 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Suggestion: Pin the silo external project to a specific Git tag or commit to ensure reproducible builds. [possible issue, importance: 10]

Suggested change
ExternalProject_Add(silo
GIT_REPOSITORY "https://github.com/LLNL/Silo"
GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4
GIT_PROGRESS ON
PATCH_COMMAND "${GIT_EXECUTABLE}" stash
&& "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"
ExternalProject_Add(silo
GIT_REPOSITORY "https://github.com/LLNL/Silo"
GIT_TAG "v4.11.1" # Or another specific, known-good commit/tag
GIT_PROGRESS ON
PATCH_COMMAND "${GIT_EXECUTABLE}" stash
&& "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"

Comment on lines 83 to 88
Copy link

Copilot AI Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Critical Issue - Incomplete Refactoring:

This PR deletes toolchain/cmake/cce/FindHDF5.cmake and removes CCE module path references from the main CMakeLists.txt, but this file still contains references to the now-deleted cmake/cce directory:

  • Lines 9-11: if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray") block adds the cce path
  • Line 96: Passes -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/../cmake/cce to Silo's build

These will cause build failures on Cray systems. Both references must be removed.

Additional Note: Removing GIT_TAG means Silo will track the default branch instead of the previously pinned commit. Consider adding a comment explaining this is intentional (e.g., "Track latest Silo for improved HDF5 detection via SiloFindHDF5.cmake").

Copilot uses AI. Check for mistakes.
Expand Down
Loading