Merge pull request #422 from henryleberre/silo-official

Silo: Reference official LLNL/Silo repository

Author: henryleberre

toolchain/dependencies/CMakeLists.txt

@@ -59,14 +59,16 @@ endif()
 
 # SILO
 if (MFC_SILO)
+    find_package(Git REQUIRED)
+
     # If we are using the CCE, HDF5 is not built, and we wish to find
     # the system's cray-hdf5. Otherwise, we point SILO to find HDF5 in
     # our common install directory using SILO_HDF5_DIR.
     ExternalProject_Add(silo
-        GIT_REPOSITORY "https://github.com/henryleberre/Silo"
-        GIT_TAG        af955eb5dd009caf00c41ca51611b37c052b042c
-        GIT_SHALLOW    ON
+        GIT_REPOSITORY "https://github.com/LLNL/Silo"
+        GIT_TAG        438477c80d32a3e1757d4584b993f382cace1535
         GIT_PROGRESS   ON
+        PATCH_COMMAND  "${GIT_EXECUTABLE}" stash && "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"
         CMAKE_ARGS      -DSILO_ENABLE_SHARED=OFF
                         -DSILO_ENABLE_SILOCK=OFF
                         -DSILO_ENABLE_BROWSER=OFF

toolchain/dependencies/Silo.patch

@@ -0,0 +1,25 @@
+From 7405f0dc998ac104b4b5c0536bbf9b0644d85a11 Mon Sep 17 00:00:00 2001
+From: Henry LE BERRE <[email protected]>
+Date: Mon, 1 Apr 2024 17:06:21 -0400
+Subject: [PATCH] CMake MFC Fixes
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 111eb42..9e460f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ project(Silo VERSION ${SILO_VERSION} LANGUAGES CXX C)
+ ###-----------------------------------------------------------------------------
+ # location for Silo CMake includes
+ ###-----------------------------------------------------------------------------
+-set(CMAKE_MODULE_PATH ${Silo_SOURCE_DIR}/CMake)
++list(APPEND CMAKE_MODULE_PATH "${Silo_SOURCE_DIR}/CMake")
+ 
+ ###-----------------------------------------------------------------------------
+ # If not already set, use a default build type of Release
+-- 
+2.45.1
+

toolchain/mfc/test/case.py

@@ -118,13 +118,14 @@ def run(self, targets: typing.List[typing.Union[str, MFCTarget]], gpus: typing.S
         tasks             = ["-n", str(self.ppn)]
         jobs              = ["-j", str(ARG("jobs"))] if ARG("case_optimization") else []
         case_optimization = ["--case-optimization"] if ARG("case_optimization") else []
+        rebuild           = [] if self.rebuild or ARG("case_optimization") else ["--no-build"]
 
         mfc_script = ".\\mfc.bat" if os.name == 'nt' else "./mfc.sh"
 
         target_names = [ get_target(t).name for t in targets ]
 
         command = [
-            mfc_script, "run", filepath, *tasks, *case_optimization,
+            mfc_script, "run", filepath, *rebuild, *tasks, *case_optimization,
             *jobs, "-t", *target_names, *gpus_select, *ARG("--")
         ]