continuing...

lanl · Jul 16, 2024 · c064b92 · c064b92
1 parent 57e1d55
commit c064b92
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/.conda/fierro/cpu/meta.yaml b/.conda/fierro/cpu/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+#{% set macos_compiler_version = "12" %}
 # We need the same MPI version in build + host. 
 # So we have to specify it, unfortunately
 {% set mpi_version = "4.1" %}
@@ -22,9 +22,11 @@ requirements:
   build:
     - cmake >=3.17.0
     - {{ compiler('c') }}={{ linux_compiler_version }} # [linux]
-    - {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
+      #- {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
+    - compiler('c')
+    - compiler('cxx')
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
-    - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
+      #- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}
       #DAN- openmpi={{ mpi_version }}
     - openmpi

diff --git a/lib/.gitignore b/lib/.gitignore
diff --git a/lib/Elements b/lib/Elements
diff --git a/scripts/build-fierro.sh b/scripts/build-fierro.sh
@@ -183,8 +183,8 @@ source setup-env.sh ${machine} ${kokkos_build_type} ${build_cores}
 
 # Next, do action based on args
 if [ "$build_action" = "full-app" ]; then
-    source uncrustify-install.sh
-    source trilinos-install.sh ${kokkos_build_type} ${machine}
+    #source uncrustify-install.sh
+    #source trilinos-install.sh ${kokkos_build_type} ${machine}
     if [ "$solver" = "explicit-evpfft" ] || [ "${solver}" = "explicit-ls-evpfft" ]; then
         source hdf5-install.sh
         source heffte-install.sh ${heffte_build_type} ${machine}

diff --git a/scripts/cmake_build.sh b/scripts/cmake_build.sh
@@ -12,7 +12,7 @@ kokkos_build_type="${3}"
 if { [ ! -d "${ELEMENTS_SOURCE_DIR}/elements" ] || [ ! -d "${ELEMENTS_SOURCE_DIR}/matar/src" ] ;}
 then
     echo "Missing submodules, downloading them...."
-    git submodule update "${ELEMENTS_SOURCE_DIR}"
+    #DANgit submodule update --recursive "${ELEMENTS_SOURCE_DIR}"
 fi
 
 if [ ! -d "${TRILINOS_INSTALL_DIR}/lib" ]; then
@@ -24,22 +24,22 @@ fi
 # Install Elements
 if [ ! -d "${ELEMENTS_INSTALL_DIR}/lib" ]; then
     echo "Installing Elements..."
-    cmake -D CMAKE_INSTALL_PREFIX="$ELEMENTS_INSTALL_DIR" -D Trilinos_DIR="${Trilinos_DIR}" -D Matar_ENABLE_KOKKOS=ON -D Matar_KOKKOS_PACKAGE=Trilinos -B "${ELEMENTS_BUILD_DIR}" -S "${ELEMENTS_SOURCE_DIR}"
-    make -C "${ELEMENTS_BUILD_DIR}" -j${FIERRO_BUILD_CORES}
-    make -C "${ELEMENTS_BUILD_DIR}" install
+    #cmake -D CMAKE_INSTALL_PREFIX="$ELEMENTS_INSTALL_DIR" -D Trilinos_DIR="${Trilinos_DIR}" -D Matar_ENABLE_KOKKOS=ON -D Matar_KOKKOS_PACKAGE=Trilinos -B "${ELEMENTS_BUILD_DIR}" -S "${ELEMENTS_SOURCE_DIR}"
+    #make -C "${ELEMENTS_BUILD_DIR}" -j${FIERRO_BUILD_CORES}
+    #make -C "${ELEMENTS_BUILD_DIR}" install
 fi
 
 # Removing stale build directory
-if [ -d "${FIERRO_BUILD_DIR}" ]; then
-    if make -C ${FIERRO_BUILD_DIR} distclean; then
-        echo "";
-    else
-        echo "distclean failed. Removing build directory."
-        rm -r ${FIERRO_BUILD_DIR}
-    fi
-else
-    mkdir -p ${FIERRO_BUILD_DIR}
-fi
+#if [ -d "${FIERRO_BUILD_DIR}" ]; then
+    #if make -C ${FIERRO_BUILD_DIR} distclean; then
+    #    echo "";
+    #else
+    #    echo "distclean failed. Removing build directory."
+    #    rm -r ${FIERRO_BUILD_DIR}
+    #fi
+#else
+    #mkdir -p ${FIERRO_BUILD_DIR}
+#fi
 
 # Configure EVPFFT using CMake
 cmake_options=(