Skip to content

Commit ce0fdb3

Browse files
authored
[FEA] Statically link liblapack and CTK libs, fix runtime images (#422)
* fix issue where images weren't all rebuilding on version bumps * add missing core cuda and rmm libs to runtime images * add clean:build and tsc:clean npm package scripts * set CMake policies, statically link liblapack and libblas * rebuild images if lerna.json changes
1 parent b100f6b commit ce0fdb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+285
-176
lines changed

.github/workflows/build-and-push-image-ssh.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
files: |
115115
${{ inputs.file }}
116116
${{ inputs.files-to-diff }}
117+
lerna\.json
117118
\.github/workflows/merge\.pr\.yml
118119
\.github/workflows/build-and-push-image\.yml
119120
\.github/actions/build-and-publish-image-ssh/action\.yml

.github/workflows/build-and-push-image.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
files: |
106106
${{ inputs.file }}
107107
${{ inputs.files-to-diff }}
108+
lerna\.json
108109
\.github/workflows/merge\.pr\.yml
109110
\.github/workflows/build-and-push-image\.yml
110111
\.github/actions/build-and-publish-image/action\.yml

.github/workflows/merge.pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
\.npmrc
2525
modules
2626
yarn\.lock
27-
package\.json
2827
build-args: |
2928
"UCX_VERSION=1.12.1"
3029
@@ -43,7 +42,6 @@ jobs:
4342
\.npmrc
4443
modules
4544
yarn\.lock
46-
package\.json
4745
dev/dockerfiles/devel/main\.Dockerfile
4846
build-args: |
4947
"CUDAARCHS=ALL"

dev/dockerfiles/devel/main.Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ${CUDA_HOME}/nvvm/lib64:\
3737
${CUDA_HOME}/lib64/stubs"
3838

3939
ARG GCC_VERSION=9
40+
ARG CMAKE_VERSION=3.24.1
4041
ARG SCCACHE_VERSION=0.2.15
4142
ARG LINUX_VERSION=ubuntu20.04
4243

@@ -71,8 +72,13 @@ deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitw
7172
\
7273
&& apt update \
7374
&& apt install --no-install-recommends -y \
74-
git cmake ninja-build \
75+
git \
76+
# Needed for CMake to find static `liblapack.a`
77+
gfortran \
78+
ninja-build \
7579
gcc-${GCC_VERSION} g++-${GCC_VERSION} gdb \
80+
cmake=${CMAKE_VERSION}-0kitware1${LINUX_VERSION}.1 \
81+
cmake-data=${CMAKE_VERSION}-0kitware1${LINUX_VERSION}.1 \
7682
curl libssl-dev libcurl4-openssl-dev xz-utils zlib1g-dev liblz4-dev \
7783
# From opengl/glvnd:devel
7884
pkg-config \

dev/dockerfiles/runtime/cudf.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
1717
/tmp/rapids/rapidsai-cuda-*.tgz \
1818
/tmp/rapids/rapidsai-rmm-*.tgz \
1919
/tmp/rapids/rapidsai-cudf-*.tgz; \
20-
for x in cudf; do \
20+
for x in core cuda rmm cudf; do \
2121
mkdir node_modules/@rapidsai/${x}/build/Release; \
2222
tar -C node_modules/@rapidsai/${x}/build/Release \
2323
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

dev/dockerfiles/runtime/cugraph.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
1818
/tmp/rapids/rapidsai-rmm-*.tgz \
1919
/tmp/rapids/rapidsai-cudf-*.tgz \
2020
/tmp/rapids/rapidsai-cugraph-*.tgz; \
21-
for x in cudf cugraph; do \
21+
for x in core cuda rmm cudf cugraph; do \
2222
mkdir node_modules/@rapidsai/${x}/build/Release; \
2323
tar -C node_modules/@rapidsai/${x}/build/Release \
2424
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

dev/dockerfiles/runtime/cuml.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
1818
/tmp/rapids/rapidsai-rmm-*.tgz \
1919
/tmp/rapids/rapidsai-cudf-*.tgz \
2020
/tmp/rapids/rapidsai-cuml-*.tgz; \
21-
for x in cudf cuml; do \
21+
for x in core cuda rmm cudf cuml; do \
2222
mkdir node_modules/@rapidsai/${x}/build/Release; \
2323
tar -C node_modules/@rapidsai/${x}/build/Release \
2424
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

dev/dockerfiles/runtime/cuspatial.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
1818
/tmp/rapids/rapidsai-rmm-*.tgz \
1919
/tmp/rapids/rapidsai-cudf-*.tgz \
2020
/tmp/rapids/rapidsai-cuspatial-*.tgz; \
21-
for x in cudf cuspatial; do \
21+
for x in core cuda rmm cudf cuspatial; do \
2222
mkdir node_modules/@rapidsai/${x}/build/Release; \
2323
tar -C node_modules/@rapidsai/${x}/build/Release \
2424
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

dev/dockerfiles/runtime/demo.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
2828
/tmp/rapids/rapidsai-deck.gl-*.tgz \
2929
/tmp/rapids/rapidsai-jsdom-*.tgz \
3030
/tmp/rapids/rapidsai-demo-*.tgz; \
31-
for x in cudf cuml cugraph cuspatial sql io; do \
31+
for x in core cuda rmm cudf cuml cugraph cuspatial sql io; do \
3232
mkdir node_modules/@rapidsai/${x}/build/Release; \
3333
tar -C node_modules/@rapidsai/${x}/build/Release \
3434
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

dev/dockerfiles/runtime/main.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN --mount=type=bind,from=build,source=/opt/rapids/,target=/tmp/rapids/ \
2727
/tmp/rapids/rapidsai-io-*.tgz \
2828
/tmp/rapids/rapidsai-deck.gl-*.tgz \
2929
/tmp/rapids/rapidsai-jsdom-*.tgz; \
30-
for x in cudf cuml cugraph cuspatial sql io; do \
30+
for x in core cuda rmm cudf cuml cugraph cuspatial sql io; do \
3131
mkdir node_modules/@rapidsai/${x}/build/Release; \
3232
tar -C node_modules/@rapidsai/${x}/build/Release \
3333
-f /tmp/rapids/rapidsai_${x}-*-Linux.tar.gz \

0 commit comments

Comments
 (0)