Skip to content

Commit ea8eba4

Browse files
davidscnfsimonis
andauthored
Update ci images for Kokkos and Ginkgo (#8)
* Update ci images for Kokkos and Ginkgo * Disable build testing * Reduce compile time of ginkgo further * Use more cores for compiling ginkgo Co-authored-by: Frédéric Simonis <simonisfrederic@gmail.com> --------- Co-authored-by: Frédéric Simonis <simonisfrederic@gmail.com>
1 parent b421a49 commit ea8eba4

4 files changed

+8
-9
lines changed

ci-fedora.dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN dnf -y update && \
2222
ninja-build \
2323
petsc-mpich-devel \
2424
eigen3-devel \
25+
kokkos-devel \
2526
python3-devel \
2627
python3-pip \
2728
google-benchmark \
@@ -31,4 +32,7 @@ RUN dnf -y update && \
3132
echo "module load mpi/mpich-x86_64" > /etc/profile.d/mpich.sh
3233

3334
# Run interactively using a bash login shell
35+
COPY --chown=root:root ginkgo/99-ginkgo-env.sh /etc/profile.d/
36+
COPY ginkgo/ginkgo-install.sh ginkgo-install.sh
37+
RUN ./ginkgo-install.sh && rm ginkgo-install.sh
3438
CMD [ "bash", "--login" ]

ci-ubuntu-2404.dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,4 @@ RUN apt-get -qq update && \
3636
&& rm -rf /var/lib/apt/lists/*
3737

3838
# Environment variables are set in the .env file
39-
COPY --chown=root:root ginkgo/99-ginkgo-env.sh /etc/profile.d/
40-
COPY ginkgo/ginkgo-install.sh ginkgo-install.sh
41-
RUN ./ginkgo-install.sh && rm ginkgo-install.sh
4239
CMD ["/bin/bash", "--login"]

ginkgo/99-ginkgo-env.sh

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Copy this file into /etc/profile.d/
22

3-
export Ginkgo_DIR=/ginkgo/build
4-
53
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$Ginkgo_DIR/lib
64
export CPATH=$CPATH:$Ginkgo_DIR/include

ginkgo/ginkgo-install.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This script installs GINKGO
2-
VERSION=3.12.4
2+
VERSION=1.8.0
33

4-
wget -c https://github.com/ginkgo-project/ginkgo/archive/refs/heads/public_common_kernels.zip
5-
unzip public_common_kernels.zip && mv ginkgo-public_common_kernels ginkgo
4+
wget -c https://github.com/ginkgo-project/ginkgo/archive/refs/tags/v$VERSION.zip
5+
unzip v$VERSION.zip && mv ginkgo-$VERSION ginkgo
66
cd ginkgo && mkdir build && cd build
7-
cmake .. && make
7+
cmake -DBUILD_TESTING="OFF" -DGINKGO_BUILD_EXAMPLES="OFF" -DGINKGO_BUILD_TESTS="OFF" .. && make -j 4

0 commit comments

Comments
 (0)