Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Danielconda #247

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ff697b7
messed up 'daniel' branch and need to remove that PR
djdunning Dec 19, 2024
5c660fe
changed how voxelizer builds
djdunning Dec 19, 2024
adc3fe8
messing around with platform definitions
djdunning Jan 6, 2025
47a62f0
messing around with platform definitions
djdunning Jan 6, 2025
efbf1c8
fixed platform issue??
djdunning Jan 6, 2025
c5f3e66
fixed platform issue for sure
djdunning Jan 6, 2025
ff301dd
fixed platform issue for sure
djdunning Jan 6, 2025
725a6e7
minor change to republish
djdunning Jan 8, 2025
1472597
updated so packages point to right elements package
djdunning Jan 8, 2025
c7bc960
removed openmpi version dependency
djdunning Jan 8, 2025
06e0b26
commented to commit
djdunning Jan 9, 2025
b2bb216
stash commit
djdunning Jan 9, 2025
bf18350
backflow mpi versions up
djdunning Jan 9, 2025
2c6463d
upward mpi change
djdunning Jan 9, 2025
a12686b
necessary changes in I think
djdunning Jan 9, 2025
d926ba7
updated mpi (technically downgraded) for all relevant packages so the…
djdunning Jan 9, 2025
dd6aa77
continuing change flow
djdunning Jan 16, 2025
da6cfb9
continuing change flow
djdunning Jan 16, 2025
7c8572a
Merge branch 'main' into danielconda
djdunning Jan 16, 2025
4591250
downstream fixes
djdunning Jan 16, 2025
3c0af88
updated trilinos version
djdunning Jan 23, 2025
88c147d
updated trilinos version
djdunning Jan 23, 2025
44647c9
updated gui requirements
djdunning Jan 23, 2025
1c05a56
updated gui requirements
djdunning Jan 23, 2025
ae863de
updated gui requirements
djdunning Jan 23, 2025
049d0c8
update requirements
djdunning Jan 23, 2025
673ae5f
update requirements
djdunning Jan 23, 2025
cbe9779
updated python version in etc
djdunning Jan 23, 2025
3542f75
update requirements
djdunning Jan 23, 2025
e82b297
update requirements
djdunning Jan 23, 2025
18bd4f0
updating gui build
djdunning Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
23 changes: 23 additions & 0 deletions .conda/elements/cpu/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export SRC_DIR=$(pwd)
echo ${SRC_DIR}
mkdir -p build
cd build

export MPI_FLAGS="--allow-run-as-root"

if [ $(uname) == Linux ]; then
export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
fi

source "$RECIPE_DIR/../../cross-compile-setup.sh"

cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
-D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-D CMAKE_CXX_STANDARD:STRING=17 \
-D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
-D Matar_ENABLE_KOKKOS=ON \
$CMAKE_ARGS \
$SRC_DIR \
-D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \

make install
50 changes: 50 additions & 0 deletions .conda/elements/cpu/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{% set version = "1.0.0" %}
{% set linux_compiler_version = "10.4.0" %}
{% set macos_compiler_version = "16" %}

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

source:
- git_url: https://github.com/lanl/ELEMENTS.git
git_depth: 1

build:
number: 1
noarch: False
script_env:
- PLATFORM={{ target_platform }} # [linux]

requirements:
build:
- cmake >=3.17.0
- {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
- matar-cpu
host:
- openmpi >=4.1.6,<5.0a0
- matar-cpu
- kokkos=4.1
run:
- openmpi >=4.1.6,<5.0a0
- matar-cpu
- kokkos=4.1

about:
home: https://github.com/lanl/ELEMENTS
license: BSD-3-Clause
license_family: BSD
license_file: LICENSE
summary:
LANL's for lagrangian mesh libraries.
description:
The C++ ELEMENTS library is a collection of sub-libraries to support implementing a diverse range
of numerical methods on low and high-order meshes. The ELEMENTS library can be used for research
and development of both continuous and discontinuous finite element methods, as well as,
finite volume methods to solve a diverse range of partial differential equations.
dev_url: https://github.com/lanl/Fierro

extra:
recipe-maintainers:
- fierromechanics
29 changes: 29 additions & 0 deletions .conda/elements/cuda/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2021, Los Alamos National Laboratory
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 changes: 23 additions & 0 deletions .conda/elements/cuda/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export SRC_DIR=$(pwd)
echo ${SRC_DIR}
mkdir -p build
cd build

export MPI_FLAGS="--allow-run-as-root"

if [ $(uname) == Linux ]; then
export MPI_FLAGS="$MPI_FLAGS;-mca;plm;isolated"
fi

source "$RECIPE_DIR/../../cross-compile-setup.sh"

cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE \
-D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-D CMAKE_CXX_STANDARD:STRING=17 \
-D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
-D Matar_ENABLE_KOKKOS=ON \
$CMAKE_ARGS \
$SRC_DIR \
-D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \

make install
10 changes: 10 additions & 0 deletions .conda/elements/cuda/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
c_compiler:
- gcc
cxx_compiler:
- gxx
target_platform:
- linux-64 # [linux]
#- linux-aarch64
#- linux-ppc64le
- osx-64 # [osx]
- osx-arm64 # [osx]
53 changes: 53 additions & 0 deletions .conda/elements/cuda/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{% set version = "1.0.0" %}
{% set linux_compiler_version = "10.4.0" %}
#{% set macos_compiler_version = "16" %}

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

source:
- git_url: https://github.com/lanl/ELEMENTS.git
git_depth: 1

build:
number: 1
noarch: False
script_env:
- PLATFORM={{ target_platform }}
skip: True # [osx]
skip: False # [linux]

requirements:
build:
- cmake >=3.17.0
- {{ compiler('cxx') }}={{ linux_compiler_version }}
- cuda-toolkit
- matar-cuda
- openmpi
host:
- openmpi >=4.1.6,<5.0a0
- matar-cuda
- kokkos=4.1
run:
- openmpi >=4.1.6,<5.0a0
- matar-cuda
- kokkos=4.1

about:
home: https://github.com/lanl/ELEMENTS
license: BSD-3-Clause
license_family: BSD
license_file: LICENSE
summary:
LANL's for lagrangian mesh libraries.
description:
The C++ ELEMENTS library is a collection of sub-libraries to support implementing a diverse range
of numerical methods on low and high-order meshes. The ELEMENTS library can be used for research
and development of both continuous and discontinuous finite element methods, as well as,
finite volume methods to solve a diverse range of partial differential equations.
dev_url: https://github.com/lanl/Fierro

extra:
recipe-maintainers:
- fierromechanics
3 changes: 2 additions & 1 deletion .conda/evpfft/cpu/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Patch the cxx variables for cross-compilation
source "$RECIPE_DIR/../../cross-compile-setup.sh"

#-D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \

cd src/EVPFFT
mkdir build
cd build
cmake ../src/ \
-D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
-D USE_FFTW=1 \
$CMAKE_ARGS \
-D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
Expand Down
13 changes: 7 additions & 6 deletions .conda/evpfft/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@ requirements:
- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
- openmpi
host:
- openmpi
- fierro-heffte
#- openmpi
- openmpi >=4.1.6,<5.0a0
- heffte-cpu
- fftw=*=mpi_openmpi_*
- kokkos=4.1
- hdf5=*=mpi_openmpi_*
- elements
- elements-cpu
run:
- openmpi
- fierro-heffte
- openmpi >=4.1.6,<5.0a0
- heffte-cpu
- fftw=*=mpi_openmpi_*
- kokkos=4.1
- hdf5=*=mpi_openmpi_*
- elements
- elements-cpu

#TODO: Add tests

Expand Down
13 changes: 7 additions & 6 deletions .conda/evpfft/cuda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ source "$RECIPE_DIR/../../cross-compile-setup.sh"
# ^ Passes $NVCC_WRAPPER_DEFAULT_COMPILER as the host compiler to nvcc
# Setting NVCC_WRAPPER_DEFAULT_COMPILER=$GXX enforces that
# nvcc gets the correct compiler for the target platform.
export OMPI_CXX=nvcc_wrapper
export NVCC_WRAPPER_DEFAULT_COMPILER=$GXX
#export OMPI_CXX=nvcc_wrapper
#export NVCC_WRAPPER_DEFAULT_COMPILER=$GXX

#-D CMAKE_CXX_COMPILER=$BUILD_PREFIX/bin/mpicxx \
#-D CMAKE_C_COMPILER=$BUILD_PREFIX/bin/mpicc \
#-D CUDAToolkit_ROOT=$PREFIX/bin \

cd src/EVPFFT
mkdir build
Expand All @@ -23,8 +27,5 @@ cmake ../src/ \
-D USE_CUFFT=1 \
$CMAKE_ARGS \
-D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS" \
-D CUDAToolkit_ROOT=$PREFIX/bin \
-D CMAKE_CXX_COMPILER=$BUILD_PREFIX/bin/mpicxx \
-D CMAKE_C_COMPILER=$BUILD_PREFIX/bin/mpicc \

make install
make install
10 changes: 10 additions & 0 deletions .conda/evpfft/cuda/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
c_compiler:
- gcc
cxx_compiler:
- gxx
target_platform:
- linux-64 # [linux]
#- linux-aarch64
#- linux-ppc64le
- osx-64 # [osx]
- osx-arm64 # [osx]
33 changes: 19 additions & 14 deletions .conda/evpfft/cuda/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-cuda
name: fierro-evpfft-cuda
version: {{ version }}

source:
Expand All @@ -12,28 +12,33 @@ source:

build:
number: 1
noarch: False
script_env:
- PLATFORM={{ target_platform }}
skip: True # [osx]
jacob-moore22 marked this conversation as resolved.
Show resolved Hide resolved
skip: False # [linux]

requirements:
build:
- cmake >=3.17.0
- {{ compiler('cxx') }}={{ linux_compiler_version }} # [linux]
- {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
- cuda-compiler
- openmpi
host:
- {{ compiler('c') }}={{ linux_compiler_version }}
- {{ compiler('cxx') }}={{ linux_compiler_version }}
- cuda-toolkit
- kokkos=4.1
- matar-cuda
- openmpi
- fierro-heffte-cuda
- hdf5=*=mpi_openmpi_h457a7a6_3
- fierro-trilinos-cuda # Statically linked against Kokkos CUDA kernels from here.
- elements
host:
- openmpi >=4.1.6,<5.0a0
- heffte-cuda
- hdf5=*=mpi_openmpi_*
- kokkos=4.1
- matar-cuda
run:
- openmpi
- fierro-heffte-cuda
- hdf5=*=mpi_openmpi_h457a7a6_3
- elements
- openmpi >=4.1.6,<5.0a0
- heffte-cuda
- hdf5=*=mpi_openmpi_*
- kokkos=4.1
- matar-cuda

about:
home: https://github.com/lanl/Fierro
Expand Down
29 changes: 19 additions & 10 deletions .conda/fierro-gui/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,43 @@ package:
version: 1

source:
path: ../../
# - git_url: https://github.com/lanl/Fierro.git
# depth: 1
#path: ../../
git_url: https://github.com/lanl/Fierro.git
depth: 1
git_submodules: false # don't need submodules

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: true # [not (linux and x86_64)]
skip: false # [linux and x86_64]

requirements:
host:
- python
- setuptools
run:
- paraview=5.11.2
- paraview >=5.13.2
- python
- numpy
- matplotlib
- pyside6=6.5
#- numpy
#- matplotlib
- pyside6 >=6.7.3

test:
imports:
- fierro_gui

- fierro-gui

about:
home: https://github.com/lanl/Fierro
license: BSD-3-Clause
license_family: BSD
summary:
GUI for the Fierro application, including all dependencies
dev_url: https://github.com/lanl/Fierro

extra:
recipe-maintainers:
- fierromechanics
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 install
Loading
Loading