Skip to content

Commit

Permalink
merged with main
Browse files Browse the repository at this point in the history
  • Loading branch information
djdunning committed Sep 11, 2024
2 parents b2ad7ca + 5f1d895 commit 6191518
Show file tree
Hide file tree
Showing 187 changed files with 47,600 additions and 7,980 deletions.
2 changes: 1 addition & 1 deletion .conda/elements/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: elements
name: elements-cpu
version: {{ version }}

source:
Expand Down
2 changes: 1 addition & 1 deletion .conda/evpfft-dev/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: evpfft-dev
name: dev-evpfft-cpu
version: {{ version }}

build:
Expand Down
2 changes: 1 addition & 1 deletion .conda/evpfft/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: evpfft
name: fierro-evpfft-cpu
version: {{ version }}

source:
Expand Down
2 changes: 1 addition & 1 deletion .conda/fierro-dev/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: fierro-dev
name: dev-fe-cpu
version: {{ version }}

build:
Expand Down
2 changes: 1 addition & 1 deletion .conda/fierro-gui/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package:
name: fierro_gui
name: fierro-gui
version: 1

source:
Expand Down
2 changes: 1 addition & 1 deletion .conda/fierro/cpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .conda/fierro/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#{% set mpi_version = "4.1" %}

package:
name: fierro-cpu
name: fierro-fe-cpu
version: {{ version }}

source:
Expand Down
4 changes: 2 additions & 2 deletions .conda/heffte/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: fierro-heffte
name: heffte-cpu
version: {{ version }}

source:
Expand Down Expand Up @@ -35,7 +35,7 @@ about:
license_family: BSD
license_file: LICENSE
summary:
LANL Fierro's dependency for EVPFFT solutions
LANL Fierro's dependency for EVPFFT solver
description:
Fierro (LANL code number C21030) is a modern C++ code designed to simulate quasi-static
solid mechanics problems and transient, compressible material dynamic problems with Lagrangian methods,
Expand Down
4 changes: 2 additions & 2 deletions .conda/heffte/cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% set cuda_version = "12.3" %}

package:
name: fierro-heffte-cuda
name: heffte-cuda
version: {{ version }}

source:
Expand Down Expand Up @@ -50,7 +50,7 @@ about:
license_family: BSD
license_file: LICENSE
summary:
LANL Fierro's dependency for EVPFFT solutions
LANL Fierro's dependency for EVPFFT solver
description:
Fierro (LANL code number C21030) is a modern C++ code designed to simulate quasi-static
solid mechanics problems and transient, compressible material dynamic problems with Lagrangian methods,
Expand Down
2 changes: 1 addition & 1 deletion .conda/trilinos/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set macos_compiler_version = "16" %}

package:
name: fierro-trilinos-cpu
name: trilinos-cpu
version: {{ version }}

source:
Expand Down
1 change: 1 addition & 0 deletions .etc/conda_build_environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dependencies:
- boa # For building
- conda-build
- anaconda-client # For uploading
- python=3.8
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
dev-utils/** linguist-documentation
dev-utils/** linguist-documentation
docs/** linguist-documentation
integrated-tests/Test-scripts/Solver-Inputs/** linguist-documentation
integrated-tests/Test-scripts/standard-results/** linguist-documentation
legacy/** linguist-documentation
python/stl_files/** linguist-documentation
scripts/** linguist-documentation
single-node/cbin/** linguist-documentation
single-node/scripts/** linguist-documentation
single-node/src/Explicit-Lagrange/meshes/** linguist-documentation
single-node/testing/tests-for-Explicit-Lagrange-Kokkos/** linguist-documentation
single-node-refactor/regression_tests/standard_inputs/** linguist-documentation
single-node-refactor/regression_tests/standard_results/** linguist-documentation
src/EVPFFT/example_input_files/** linguist-documentation
src/EVPFFT/scripts/** linguist-documentation
src/LS-EVPFFT/example_input_files/** linguist-documentation
src/LS-EVPFFT/scripts/** linguist-documentation
src/Mesh-Builder/examples/** linguist-documentation
src/Parallel-Solvers/Implicit-Lagrange/Mesh_Examples/** linguist-documentation
src/Parallel-Solvers/Implicit-Lagrange/MueLu_XML_Examples/** linguist-documentation
src/Parallel-Solvers/Parallel-Explicit/Example_Yaml_Scripts/** linguist-documentation
2 changes: 1 addition & 1 deletion .github/workflows/build-conda-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
86 changes: 86 additions & 0 deletions .github/workflows/fierro-test-no-implicit.yml
Original file line number Diff line number Diff line change
@@ -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-fe-cpu
conda install -c conda-forge -c fierromechanics fierro-evpfft-cpu
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


106 changes: 106 additions & 0 deletions .github/workflows/fierro-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
name: Fierro Test

# 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: 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: Install dos2unix
run:
sudo apt-get install dos2unix
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-fe-cpu
conda install -c conda-forge -c fierromechanics fierro-evpfft-cpu
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
export OMP_PROC_BIND=spread
export OMP_NUM_THREADS=1
export OMP_PLACES=threads
mpirun -np 1 --bind-to core 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

- name: Test fierro-parallel-implicit
run: |
source ~/.bashrc
conda activate build-env
dos2unix ./Example_Yaml_Scripts/example_implicit_basic.yaml
export OMP_PROC_BIND=spread
export OMP_NUM_THREADS=1
export OMP_PLACES=threads
mpirun -np 1 --bind-to core fierro-parallel-implicit ./Example_Yaml_Scripts/example_implicit_basic.yaml
working-directory: ./src/Parallel-Solvers/Implicit-Lagrange
shell: bash




37 changes: 37 additions & 0 deletions .github/workflows/publish-all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Publish All

on: workflow_dispatch

jobs:
elements:
uses: ./.github/workflows/publish-elements.yml

evpfft-cpu:
uses: ./.github/workflows/publish-evpfft-cpu.yml

evpfft-dev:
uses: ./.github/workflows/publish-evpfft-dev.yml

evpfft-gui:
uses: ./.github/workflows/publish-evpfft-gui.yml

fierro-cpu:
uses: ./.github/workflows/publish-fierro-cpu.yml

fierro-dev:
uses: ./.github/workflows/publish-fierro-dev.yml

fierro-gui:
uses: ./.github/workflows/publish-fierro-gui.yml

heffte-cpu:
uses: ./.github/workflows/publish-heffte-cpu.yml

heffte-cuda:
uses: ./.github/workflows/publish-heffte-cuda.yml

trilinos:
uses: ./.github/workflows/publish-trillinos.yml

voxelizer:
uses: ./.github/workflows/publish-voxelizer.yml
4 changes: 0 additions & 4 deletions .github/workflows/publish-elements.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: 'Publish Elements'

on:
push:
paths:
- .conda/elements/**
- .github/workflows/publish-elements.yaml
workflow_dispatch:

jobs:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/publish-evpfft-cpu.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: 'Publish EVPFFT-CPU'

on:
push:
paths:
- .conda/evpfft/**
- src/EVPFFT/src/**
- .github/workflows/publish-evpfft-cpu.yaml
workflow_dispatch:

jobs:
Expand Down
Loading

0 comments on commit 6191518

Please sign in to comment.