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.

Sign up for GitHub

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

removed use of the gmds_temp branch #42

Merged
merged 2 commits into from
Aug 29, 2024
Merged

removed use of the gmds_temp branch #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
404869a
removed use of the gmds_temp branch
nicolaslg Aug 29, 2024
dd7d1a4
added python variant to the spack-gmds dockerfile in order to have py…
nicolaslg Aug 29, 2024
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
10 changes: 4 additions & 6 deletions build_spack_gmds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git clone --depth=1 -b v0.20.3 https://github.com/spack/spack.git
# have a fresh start
#==========================================
# get our recipes
git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git
git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git
#==========================================
# modifying spack configuration
#==========================================
Expand All @@ -16,15 +16,13 @@ git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Ge
# Optionnal: modifying the install_tree variable to make it shorter and more human readable;
# the HASH part in install directory names is removed which can lead to collisions.
# The spack/etc/spack/defaults/config.yaml file can be modified by hand
# - in spack version 0.19.2
#sed -i 's#"${ARCHITECTURE}/${COMPILERNAME}-${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"#"${PACKAGE}"#g' spack/etc/spack/defaults/config.yaml
# - in spack version 0.20.1
# - in spack version 0.20.3
#sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml

# to register our recipes; it assumes that spack_recipes and spack are located at
# the same level. You can use the "spack repo add" commands instead of copying the repos.yaml file
#spack repo add ./spack_recipes/meshing_repo
#spack repo add ./spack_recipes/supersede_repo
#spack repo add ./spack_recipes/meshing
#spack repo add ./spack_recipes/meshing_supersede
cp spack_recipes/config/repos.yaml spack/etc/spack/defaults/repos.yaml

# Optionnal: the default tmpdir used to build is defined in spack/etc/spack/defaults/config.yaml
Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/Dockerfile.spack-gmds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git
sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
#==========================================
RUN source ./spack/share/spack/setup-env.sh && \
git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
spack repo add ./spack_recipes/meshing_repo &&\
spack repo add ./spack_recipes/supersede_repo &&\
git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
spack repo add ./spack_recipes/meshing &&\
spack repo add ./spack_recipes/meshing_supersede &&\
spack config --scope site add 'packages:all:target:[x86_64]' &&\
spack compiler find &&\
spack external find cmake
#==========================================
RUN source ./spack/share/spack/setup-env.sh && \
spack install --only dependencies gmds+kmds+blocking ^kokkos+openmp ^cgns~mpi
spack install --only dependencies gmds+kmds+blocking+python ^kokkos+openmp ^cgns~mpi
#==========================================
RUN rm -rf /spack/var/spack/cache/*
#==========================================
6 changes: 3 additions & 3 deletions dockerfiles/Dockerfile.spack-gmds-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git
sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
#==========================================
RUN source ./spack/share/spack/setup-env.sh && \
git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
spack repo add ./spack_recipes/meshing_repo &&\
spack repo add ./spack_recipes/supersede_repo &&\
git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
spack repo add ./spack_recipes/meshing &&\
spack repo add ./spack_recipes/meshing_supersede &&\
spack config --scope site add 'packages:all:target:[x86_64]' &&\
spack compiler find &&\
spack external find cmake
Expand Down