From d7802530f8c319015c2976c2eb4b630ad2c2ffee Mon Sep 17 00:00:00 2001 From: Daniel Dunning <39738037+djdunning@users.noreply.github.com> Date: Tue, 16 Jul 2024 09:30:01 -0600 Subject: [PATCH] taking out specified mpi version --- .conda/fierro/cpu/meta.yaml | 11 +++++++---- lib/Elements | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.conda/fierro/cpu/meta.yaml b/.conda/fierro/cpu/meta.yaml index 9f7856758..b08072651 100644 --- 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 index 0de655cd2..19b5cad11 160000 --- a/lib/Elements +++ b/lib/Elements @@ -1 +1 @@ -Subproject commit 0de655cd260e60e4f037a78561dddfb9c8757fc7 +Subproject commit 19b5cad11d411a914cf188814afb2bd6180c85b7