Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit a4f1060

Browse files
authored
Merge pull request #52 from maleadt/tb/update
Work around bug in images
2 parents 8e6117f + ef1b490 commit a4f1060

File tree

4 files changed

+44
-41
lines changed

4 files changed

+44
-41
lines changed

.gitlab-ci.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@ before_script:
55

66
# template
77

8+
# FIXME: https://gitlab.com/nvidia/container-images/cuda/-/issues/93
9+
810
.build:
9-
script:
10-
- docker build --pull --tag ${CI_JOB_ID} $CI_DOCKER_BUILD_ARGS .
11-
- docker run --rm --runtime nvidia --env JULIA_CUDA_MEMORY_LIMIT $CI_DOCKER_RUN_ARGS $CI_JOB_ID -e '
12-
run(`id`);
13-
using CUDA;
14-
CUDA.versioninfo();
15-
using Pkg;
16-
Pkg.test(collect(keys(Pkg.installed())));'
17-
- docker rmi ${CI_JOB_ID}
11+
script: |
12+
docker build --pull --tag ${CI_JOB_ID} $CI_DOCKER_BUILD_ARGS .
13+
DRIVER=$(find /usr/lib/x86_64-linux-gnu/nvidia -name 'libcuda.so.*' -type f)
14+
COMPILER=$(find /usr/lib/x86_64-linux-gnu/nvidia -name 'libnvidia-ptxjitcompiler.so.*' -type f)
15+
docker run --rm --gpus all --env JULIA_CUDA_MEMORY_LIMIT $CI_DOCKER_RUN_ARGS \
16+
--volume "$DRIVER:/usr/lib/x86_64-linux-gnu/libcuda.so.1" \
17+
--volume "$COMPILER:/usr/lib/x86_64-linux-gnu/libnvidia-ptxjitcompiler.so.1" \
18+
$CI_JOB_ID -e '
19+
run(`id`);
20+
using CUDA;
21+
CUDA.versioninfo();
22+
using Pkg;
23+
Pkg.test(collect(keys(Pkg.installed())));'
24+
docker rmi ${CI_JOB_ID}
25+
interruptible: true
1826

1927

2028
# CUDA versions
@@ -27,22 +35,12 @@ cuda:11.0:
2735
cuda:10.2:
2836
extends: .build
2937
variables:
30-
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04'
38+
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04'
3139

3240
cuda:10.1:
3341
extends: .build
3442
variables:
35-
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04'
36-
37-
cuda:10.0:
38-
extends: .build
39-
variables:
40-
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04'
41-
42-
cuda:9.2:
43-
extends: .build
44-
variables:
45-
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:9.2-cudnn7-devel-ubuntu18.04'
43+
CI_DOCKER_BUILD_ARGS: '--build-arg IMAGE=nvidia/cuda:10.1-cudnn8-devel-ubuntu18.04'
4644

4745

4846
# special tests

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ RUN JULIA_DEPOT_PATH=/usr/local/share/julia \
3030

3131
# generate the device runtime library for all known and supported devices
3232
RUN JULIA_DEPOT_PATH=/usr/local/share/julia \
33-
julia -e 'using CUDA; CUDA.load_runtime.([v"3.0", v"3.2", v"3.5", v"3.7", \
34-
v"5.0", v"5.2", v"5.3", \
35-
v"6.0", v"6.1", v"6.2", \
36-
v"7.0"])'
33+
julia -e 'using CUDA; CUDA.precompile_runtime()' && \
34+
chmod 644 /usr/local/share/julia/compiled/v1.5/GPUCompiler/*/*.bc
35+
# TODO: fix this in GPUCompiler.jl
3736

3837

3938
# user environment

Manifest.toml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ version = "0.5.0"
88

99
[[Adapt]]
1010
deps = ["LinearAlgebra"]
11-
git-tree-sha1 = "95f8bda0555209f122bc796b0382ea4a3a121720"
11+
git-tree-sha1 = "42c42f2221906892ceb765dbcb1a51deeffd86d7"
1212
uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
13-
version = "2.1.0"
13+
version = "2.3.0"
14+
15+
[[BFloat16s]]
16+
deps = ["LinearAlgebra", "Test"]
17+
git-tree-sha1 = "4af69e205efc343068dc8722b8dfec1ade89254a"
18+
uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b"
19+
version = "0.1.0"
1420

1521
[[Base64]]
1622
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -27,16 +33,16 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
2733
version = "0.4.1"
2834

2935
[[CUDA]]
30-
deps = ["AbstractFFTs", "Adapt", "BinaryProvider", "CEnum", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"]
31-
git-tree-sha1 = "83bfd180e2f842f6d4ee315a6db8665e9aa0c19b"
36+
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "BinaryProvider", "CEnum", "DataStructures", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "Libdl", "LinearAlgebra", "Logging", "MacroTools", "NNlib", "Pkg", "Printf", "Random", "Reexport", "Requires", "SparseArrays", "Statistics", "TimerOutputs"]
37+
git-tree-sha1 = "eb6d045a717d7318a411bd29e3eb3b44b6ac18fe"
3238
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
33-
version = "1.3.3"
39+
version = "2.0.1"
3440

3541
[[Compat]]
3642
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
37-
git-tree-sha1 = "7c7f4cda0d58ec999189d70f5ee500348c4b4df1"
43+
git-tree-sha1 = "8cd7b7d1c7f6fcbe7e8743a58adf57788ec7f787"
3844
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
39-
version = "3.16.0"
45+
version = "3.18.0"
4046

4147
[[DataStructures]]
4248
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
@@ -63,25 +69,25 @@ version = "0.1.2"
6369

6470
[[GPUArrays]]
6571
deps = ["AbstractFFTs", "Adapt", "LinearAlgebra", "Printf", "Random", "Serialization"]
66-
git-tree-sha1 = "da6398282abd2a8c0dc3e55b49d984fcc2c582e5"
72+
git-tree-sha1 = "e39817aafb64a0794817a1e5126d042d0b26f700"
6773
uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
68-
version = "5.2.1"
74+
version = "6.0.1"
6975

7076
[[GPUCompiler]]
7177
deps = ["DataStructures", "InteractiveUtils", "LLVM", "Libdl", "TimerOutputs", "UUIDs"]
72-
git-tree-sha1 = "05097d81898c527e3bf218bb083ad0ead4378e5f"
78+
git-tree-sha1 = "1b19d415fc3581ff0ed2f57875fca16b5190060a"
7379
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
74-
version = "0.6.1"
80+
version = "0.7.3"
7581

7682
[[InteractiveUtils]]
7783
deps = ["Markdown"]
7884
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
7985

8086
[[LLVM]]
8187
deps = ["CEnum", "Libdl", "Printf", "Unicode"]
82-
git-tree-sha1 = "a662366a5d485dee882077e8da3e1a95a86d097f"
88+
git-tree-sha1 = "70070a0131f17fcffc5fc004f5f73f037bd217c5"
8389
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
84-
version = "2.0.0"
90+
version = "3.2.0"
8591

8692
[[LibGit2]]
8793
deps = ["Printf"]
@@ -145,9 +151,9 @@ version = "0.2.0"
145151

146152
[[Requires]]
147153
deps = ["UUIDs"]
148-
git-tree-sha1 = "2fc2e1ab606a5dca7bbad9036a694553c3a57926"
154+
git-tree-sha1 = "28faf1c963ca1dc3ec87f166d92982e3c4a1f66d"
149155
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
150-
version = "1.0.3"
156+
version = "1.1.0"
151157

152158
[[SHA]]
153159
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
33

44
[compat]
5-
julia = "1.5.0"
5+
julia = "1.5.2"

0 commit comments

Comments
 (0)