From 1fcc5d155bc1c503326c573cc462d63bd8dadad7 Mon Sep 17 00:00:00 2001 From: Malmahrouqi3 Date: Mon, 10 Nov 2025 00:42:48 -0500 Subject: [PATCH 1/4] removed custom FindHDF5.cmake as ig it has been fixed already --- CMakeLists.txt | 4 --- toolchain/cmake/cce/FindHDF5.cmake | 39 ------------------------------ 2 files changed, 43 deletions(-) delete mode 100644 toolchain/cmake/cce/FindHDF5.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index c588ae47ab..f08799038c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/toolchain/cmake/cce/FindHDF5.cmake b/toolchain/cmake/cce/FindHDF5.cmake deleted file mode 100644 index bb251f875f..0000000000 --- a/toolchain/cmake/cce/FindHDF5.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Attempt to find HDF5 -# URL: https://www.hdfgroup.org/solutions/hdf5/ -# DOCS: https://cmake.org/cmake/help/latest/command/find_library.html -# https://cmake.org/cmake/help/latest/module/FindPackageHandleStandardArgs.html - -include(FindPackageHandleStandardArgs) - - -find_path(HDF5_INCLUDE_DIR - NAMES hdf5.h - PATH_SUFFIXES hdf5 -) - -find_library(HDF5_LIBRARY - NAMES libhdf5 hdf5 - PATH_SUFFIXES hdf5 - NAMES_PER_DIR -) - - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - HDF5 - REQUIRED_VARS - HDF5_LIBRARY - HDF5_INCLUDE_DIR -) - - -if (HDF5_FOUND AND NOT TARGET HDF5::HDF5) - set(HDF5_LIBRARIES "${HDF5_LIBRARY}") - set(HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIR}") - - add_library(HDF5::HDF5 UNKNOWN IMPORTED) - - set_target_properties(HDF5::HDF5 PROPERTIES - IMPORTED_LOCATION "${HDF5_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}" - ) -endif() From 77402d8c9def340655b78c51f6e820bf96ae636e Mon Sep 17 00:00:00 2001 From: Malmahrouqi3 Date: Mon, 10 Nov 2025 01:14:01 -0500 Subject: [PATCH 2/4] changed silo repo to Silo-mo2 --- toolchain/dependencies/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index aae2a3cad5..726b10bea9 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -81,8 +81,8 @@ if (MFC_SILO) find_package(Git REQUIRED) ExternalProject_Add(silo - GIT_REPOSITORY "https://github.com/LLNL/Silo" - GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4 + GIT_REPOSITORY "https://github.com/Malmahrouqi3/Silo-mo2" +# GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4 GIT_PROGRESS ON PATCH_COMMAND "${GIT_EXECUTABLE}" stash && "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch" From 21c211c659d0bcdc342e261a3050adeee1c50542 Mon Sep 17 00:00:00 2001 From: Malmahrouqi3 Date: Tue, 11 Nov 2025 18:03:36 -0500 Subject: [PATCH 3/4] restored Silo repo to LLNL/Silo --- toolchain/dependencies/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index 726b10bea9..e2c5f87656 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -81,8 +81,7 @@ if (MFC_SILO) find_package(Git REQUIRED) ExternalProject_Add(silo - GIT_REPOSITORY "https://github.com/Malmahrouqi3/Silo-mo2" -# GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4 + GIT_REPOSITORY "https://github.com/LLNL/Silo" GIT_PROGRESS ON PATCH_COMMAND "${GIT_EXECUTABLE}" stash && "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch" From 11dabb113938b021e72a9b1863284735c6731e2d Mon Sep 17 00:00:00 2001 From: "Mohammed S. Al-Mahrouqi" <145478595+Malmahrouqi3@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:41:49 -0500 Subject: [PATCH 4/4] Use main branch instead of master --- toolchain/dependencies/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index e2c5f87656..51403524e1 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -82,6 +82,7 @@ if (MFC_SILO) ExternalProject_Add(silo GIT_REPOSITORY "https://github.com/LLNL/Silo" + GIT_TAG main GIT_PROGRESS ON PATCH_COMMAND "${GIT_EXECUTABLE}" stash && "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"