taking out specified mpi version

lanl · Jul 16, 2024 · d780253 · d780253
1 parent 1542245
commit d780253
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.conda/fierro/cpu/meta.yaml b/.conda/fierro/cpu/meta.yaml
@@ -3,7 +3,7 @@
 {% 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" %}
+#DAN{% set mpi_version = "4.1" %}
 
 package:
   name: fierro-cpu
@@ -25,16 +25,19 @@ requirements:
     - {{ compiler('c') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
-    - openmpi={{ mpi_version }}
+    - openmpi
+      #DAN    - openmpi={{ mpi_version }}
   host:
     - _openmp_mutex # [linux]
     - llvm-openmp   # [osx]
-    - openmpi={{ mpi_version }}
+      #DAN    - openmpi={{ mpi_version }}
+    - openmpi
     - fierro-trilinos-cpu
     - elements
   run:
     - fierro-trilinos-cpu
-    - mpi
+    - openmpi
+      #DAN    - mpi
 
 about:
   home: https://github.com/lanl/Fierro

diff --git a/lib/Elements b/lib/Elements
+16 −6		CMakeLists.txt
+0 −5		examples/CMakeLists.txt
+4 −5		examples/average/test/CMakeLists.txt
+1 −1		matar
+3 −0		scripts/build-elements.sh
+3 −3		scripts/cmake_build_test.sh
+7 −7		scripts/elements-install.sh
+2 −2		scripts/setup-env.sh
+3 −0		src/elements_lib_dummy.cpp
+8 −26		tests/CMakeLists.txt