merge conflicts

.conda/elements/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 = "16" %}
 
 package:
   name: elements

.conda/evpfft-dev/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 = "16" %}
 
 package:
   name: evpfft-dev

.conda/evpfft/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 = "16" %}
 
 package:
   name: evpfft

.conda/evpfft/cuda/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 = "16" %}
 
 package:
   name: evpfft-cuda

.conda/fierro-dev/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 = "16" %}
 
 package:
   name: fierro-dev

.conda/fierro-gui/meta.yaml

@@ -0,0 +1,36 @@
+package: 
+  name: fierro_gui
+  version: 1
+
+source:
+  path: ../../
+  # - git_url: https://github.com/lanl/Fierro.git
+  #   depth: 1
+
+build:
+  number: 0
+  script: cd python/FIERRO-GUI/; python -m pip install .
+  noarch: python # This is a pure python package. So build for noarch on linux64
+  entry_points:
+    - fierro-gui = fierro_gui.gui:main
+  skip: true  # [not (linux and x86_64)]
+  skip: false # [linux and x86_64]
+
+requirements:
+  host:
+    - python
+    - setuptools
+  run:
+    - paraview=5.11.2
+    - python
+    - numpy
+    - matplotlib
+    - pyside6=6.5
+
+test:
+  imports:
+    - fierro_gui
+
+extra:
+  recipe-maintainers:
+    - fierromechanics

.conda/fierro/cpu/build.sh

@@ -21,4 +21,4 @@ cmake .. \
       -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
       -D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
 
-make -j 10 install
+make -j 10 install

.conda/fierro/cpu/meta.yaml

@@ -1,9 +1,10 @@
 {% set version = "1.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 # We need the same MPI version in build + host. 
 # So we have to specify it, unfortunately
-{% set mpi_version = "4.1" %}
+# UPDATE: Not necessary right now, perhaps in the future
+#{% set mpi_version = "4.1" %}
 
 package:
   name: fierro-cpu
@@ -26,16 +27,16 @@ requirements:
     - {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}
-    - openmpi={{ mpi_version }}
+    - openmpi
   host:
     - _openmp_mutex # [linux]
     - llvm-openmp   # [osx]
-    - openmpi={{ mpi_version }}
     - fierro-trilinos-cpu
     - elements
+    - openmpi
   run:
     - fierro-trilinos-cpu
-    - mpi
+    - openmpi
 
 about:
   home: https://github.com/lanl/Fierro

.conda/heffte/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 = "16" %}
 
 package:
   name: fierro-heffte

.conda/heffte/cuda/build.sh

@@ -7,20 +7,22 @@ export MPI_FLAGS="--allow-run-as-root"
 
 if [ $(uname) == Linux ]; then
     export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
+#    export CUDACXX=$(which nvcc)
 fi
 
 source "$RECIPE_DIR/../../cross-compile-setup.sh"
 
 export OMPI_CXX=nvcc
 # Only do this for cross compiling
-if [ "$PLATFORM" != "linux-64" ] ; then
-    export NVCC_PREPEND_FLAGS="-ccbin $CXX";
-fi
+#if [ "$PLATFORM" != "linux-64" ] ; then
+#    export NVCC_PREPEND_FLAGS="-ccbin $CXX";
+#fi
 # These things need to be set for certain cmake versions.
 # The cmake CUDA compiler tests need to see the host env libs
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH $PREFIX/lib"
 export LIBRARIES="$LIBRARIES \"-L$PREFIX/lib\""
 
+      #-D CMAKE_CUDA_COMPILER=${CUDACXX} \
 cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D BUILD_SHARED_LIBS=ON \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
@@ -30,11 +32,10 @@ cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       $CMAKE_ARGS \
       $SRC_DIR \
       -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
-      -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
-      -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
-      -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \
-      -D CMAKE_CUDA_COMPILER=$(which nvcc) \
+#      -D MPI_C_COMPILER="$BUILD_PREFIX/bin/mpicc" \
+#      -D MPI_CXX_COMPILER="$BUILD_PREFIX/bin/mpicxx" \
+#      -D CMAKE_CUDA_HOST_LINK_LAUNCHER=$CXX \
 
 make -j 10 install
 
-source "$RECIPE_DIR/../make-relocatable.sh"
+source "$RECIPE_DIR/../make-relocatable.sh"

.conda/heffte/cuda/meta.yaml

@@ -1,7 +1,7 @@
 {% set version = "1.0.0" %}
-{% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
-{% set cuda_version = "12.3" %}
+{% set linux_compiler_version = "12.4.0" %}
+{% set macos_compiler_version = "16" %}
+#{% set cuda_version = "12.5" %}
 
 package:
   name: fierro-heffte-cuda
@@ -28,11 +28,16 @@ requirements:
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}={{ linux_compiler_version }}
     - openmpi
-    - cuda-toolkit={{ cuda_version }}
+      # - cuda-compiler
+      #    - cuda-toolkit={{ cuda_version }}
+    - cuda-toolkit
   # These host CUDA dependencies are definitely overspecified.
   # Not sure which ones are totally necessary.
   host:
-    - cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
+    #- cuda-cudart-static={{ cuda_version }} # Make sure your nvcc version and cudart versions are the same
+    - cuda-compiler
+    - cuda-cudart-static
+    - cuda-toolkit
     - libcusolver-dev
     - libcufft-dev
     - libcublas-dev

.conda/trilinos/cpu/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "15.0.0" %}
 {% set linux_compiler_version = "10.4.0" %}
-{% set macos_compiler_version = "12" %}
+{% set macos_compiler_version = "16" %}
 
 package:
   name: fierro-trilinos-cpu

.conda/voxelizer/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 = "16" %}
 
 package: 
   name: fierro-voxelizer

.etc/conda_build_environment.yaml

@@ -7,3 +7,4 @@ dependencies:
   - boa # For building
   - conda-build
   - anaconda-client # For uploading
+  - python=3.8

.github/workflows/build-conda-package.yaml

@@ -53,7 +53,7 @@ jobs:
       #       conda-${{ runner.os }}--${{ runner.arch }}--${{ steps.get-date.outputs.today }}-${{ hashFiles('.etc/conda_build_environment.yaml') }}-${{ env.CACHE_NUMBER }}
       #   env:
       #     CACHE_NUMBER: 1
-      #   id: cache
+      #   id: cached
 
       - name: Update environment
         run:

.github/workflows/fierro-test-no-implicit.yml

@@ -0,0 +1,86 @@
+name: Fierro Test (No Implicit)
+
+# Workflow runs on following successful conda distribution
+on:
+  workflow_run:
+    workflows: [Publish Test, Publish All, Publish Elements, Publish EVPFFT-CPU, Publish EVPFFT-dev, Publish EVPFFT-GPU, Publish FIERRO GUI, Publish Fierro-CPU, Publish Fierro-dev, Publish Heffte, Publish Heffte CUDA, Publish Trilinos-CPU]
+    types:
+      - completed
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: print trigger event
+      run: |
+        echo "::workflow triggering event name is::" ${{ github.event_name }} 
+    - name: update the package list
+      run:
+        sudo apt-get update
+      shell: bash
+    - name: Install build tools
+      run:
+        sudo apt-get install build-essential
+      shell: bash
+    - name: Install LaPack
+      run:
+        sudo apt-get install libblas-dev liblapack-dev
+      shell: bash
+    - name: Install MPI
+      run: |
+        sudo apt-get install libopenmpi-dev openmpi-bin
+        echo "MPI_OPTS=--oversubscribe" >> $GITHUB_ENV
+    - name: Install cmake
+      run:
+        sudo apt-get -y install cmake
+      shell: bash
+    - name: Install python
+      run:
+        sudo apt-get install python3.6
+      shell: bash
+
+    - name: Set up Miniconda
+      uses: conda-incubator/setup-miniconda@v2
+      with:
+        auto-update-conda: true
+        python-version: 3.8
+
+    - name: Create conda environment
+      run: conda env create -f ./.etc/conda_build_environment.yaml
+
+    - name: Initialize conda
+      run: conda init bash
+
+    - name: Activate conda environment, install Fierro anaconda packages
+      run: |
+        source ~/.bashrc
+        conda activate build-env
+        conda install --solver=classic conda-forge::conda-libmamba-solver conda-forge::libmamba conda-forge::libmambapy conda-forge::libarchive
+        conda install -c conda-forge -c fierromechanics fierro-cpu
+        conda install -c conda-forge -c fierromechanics evpfft 
+        conda install -c conda-forge -c fierromechanics fierro_gui 
+        
+    - name: Verify package dependencies
+      run: |
+        conda info --envs
+        conda list
+
+    - name: Test fierro-parallel-explicit
+      run: |
+        source ~/.bashrc
+        conda activate build-env
+        fierro-parallel-explicit ./src/Parallel-Solvers/Parallel-Explicit/Example_Yaml_Scripts/example_simple.yaml
+      shell: bash
+
+    - name: Test fierro-mesh-builder
+      run: |
+        source ~/.bashrc
+        conda activate build-env
+        fierro-mesh-builder ./src/Mesh-Builder/examples/mesh_Box_16_p3.yaml
+      shell: bash
+
+