Skip to content

Commit 574b05e

Browse files
[ci] Upgrade conda cudatoolkit version to 11.3 (#6070)
Related issue = # <!-- Thank you for your contribution! If it is your first time contributing to Taichi, please read our Contributor Guidelines: https://docs.taichi-lang.org/docs/contributor_guide - Please always prepend your PR title with tags such as [CUDA], [Lang], [Doc], [Example]. For a complete list of valid PR tags, please check out https://github.com/taichi-dev/taichi/blob/master/misc/prtags.json. - Use upper-case tags (e.g., [Metal]) for PRs that change public APIs. Otherwise, please use lower-case tags (e.g., [metal]). - More details: https://docs.taichi-lang.org/docs/contributor_guide#pr-title-format-and-tags - Please fill in the issue number that this PR relates to. - If your PR fixes the issue **completely**, use the `close` or `fixes` prefix so that GitHub automatically closes the issue when the PR is merged. For example, Related issue = close #2345 - If the PR does not belong to any existing issue, free to leave it blank. --> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 72804ae commit 574b05e

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
mkdir -m777 shared
8888
docker create --user dev --name taichi_build --gpus all -v /tmp/.X11-unix:/tmp/.X11-unix \
8989
-e DISPLAY -e PY -e GPU_BUILD -e TAICHI_CMAKE_ARGS -e PROJECT_NAME \
90-
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.2 \
90+
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.4 \
9191
/home/dev/taichi/.github/workflows/scripts/unix_build.sh
9292
tar -cf - ../${{ github.event.repository.name }} --mode u=+rwx,g=+rwx,o=+rwx --owner 1000 --group 1000 | docker cp - taichi_build:/home/dev/
9393
docker start -a taichi_build
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
docker create --user dev --name taichi_test --gpus all -v /tmp/.X11-unix:/tmp/.X11-unix \
113113
-e DISPLAY -e PY -e GPU_TEST \
114-
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.2 \
114+
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.4 \
115115
/home/dev/unix_test.sh
116116
docker cp .github/workflows/scripts/unix_test.sh taichi_test:/home/dev/unix_test.sh
117117
docker cp .github/workflows/scripts/common-utils.sh taichi_test:/home/dev/common-utils.sh

.github/workflows/testing.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ jobs:
405405
--gpus 'all,"capabilities=graphics,utility,display,video,compute"' \
406406
-v /tmp/.X11-unix:/tmp/.X11-unix \
407407
-e PY -e GPU_BUILD -e PROJECT_NAME -e TAICHI_CMAKE_ARGS -e DISPLAY \
408-
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.3 \
408+
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.4 \
409409
/home/dev/taichi/.github/workflows/scripts/unix_build.sh
410410
# A tarball is needed because sccache needs some permissions that only the file owner has.
411411
# 1000 is the uid and gid of user "dev" in the container.
@@ -444,7 +444,7 @@ jobs:
444444
-e TI_LITE_TEST \
445445
-e TI_TEST_OFFLINE_CACHE \
446446
-e DISPLAY -e PY -e GPU_TEST -e TI_WANTED_ARCHS -e TI_RUN_RELEASE_TESTS \
447-
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.3 \
447+
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.4 \
448448
/home/dev/unix_test.sh
449449
docker cp .github/workflows/scripts/unix_test.sh taichi_test:/home/dev/unix_test.sh
450450
docker cp .github/workflows/scripts/common-utils.sh taichi_test:/home/dev/common-utils.sh
@@ -671,7 +671,7 @@ jobs:
671671
docker run --user dev --name taichi_build_host \
672672
$DOCKER_RUN_ARGS \
673673
-v $TAICHI_WHEEL_DIR:/home/dev/taichi/dist \
674-
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.3 \
674+
registry.taichigraphics.com/taichidev-ubuntu18.04:v0.3.4 \
675675
/home/dev/taichi/.github/workflows/scripts/unix-build-v2.sh
676676
env:
677677
TAICHI_CMAKE_ARGS: >-

ci/Dockerfile.ubuntu.18.04

+9-9
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh &
9393
bash Miniconda3-latest-Linux-x86_64.sh -p /home/dev/miniconda -b
9494
ENV PATH="/home/dev/miniconda/bin:$PATH"
9595

96-
# Set up multi-python environment
97-
RUN conda init bash
98-
RUN conda create -n py36 python=3.6 pytorch cudatoolkit=10.2 -c pytorch -y
99-
RUN conda create -n py37 python=3.7 pytorch cudatoolkit=10.2 -c pytorch -y
100-
RUN conda create -n py38 python=3.8 pytorch cudatoolkit=10.2 -c pytorch -y
101-
RUN conda create -n py39 python=3.9 pytorch cudatoolkit=10.2 -c pytorch -y
102-
# TODO add torch to 3.10 when supported
103-
RUN conda create -n py310 python=3.10 -y
104-
10596
# Remove mesa EGL driver, which interferes with the propritary NVIDIA drivers
10697
RUN rm -f /usr/lib/x86_64-linux-gnu/libEGL_mesa*
10798

10899
WORKDIR /home/dev
109100
ENV LANG="C.UTF-8"
101+
102+
# Set up multi-python environment
103+
RUN conda init bash
104+
RUN conda create -n py36 python=3.6 pytorch cudatoolkit=11.3 -c pytorch -y
105+
RUN conda create -n py37 python=3.7 pytorch cudatoolkit=11.3 -c pytorch -y
106+
RUN conda create -n py38 python=3.8 pytorch cudatoolkit=11.3 -c pytorch -y
107+
RUN conda create -n py39 python=3.9 pytorch cudatoolkit=11.3 -c pytorch -y
108+
# TODO add torch to 3.10 when supported
109+
RUN conda create -n py310 python=3.10 -y

0 commit comments

Comments
 (0)