Skip to content

Commit cb231f5

Browse files
authored
JLL/CI/Julia changes. (#2042)
1 parent 0df64ed commit cb231f5

File tree

4 files changed

+173
-144
lines changed

4 files changed

+173
-144
lines changed

.buildkite/pipeline.yml

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,13 @@ steps:
1818
queue: "juliagpu"
1919
cuda: "*"
2020
commands: |
21-
julia --project -e '
22-
# make sure the 1.7-era Manifest works on this Julia version
23-
using Pkg
24-
Pkg.resolve()
25-
26-
# use the CUDA installation from the CI image
27-
using CUDA
28-
CUDA.set_runtime_version!("local")'
21+
echo -e "[CUDA_Runtime_jll]\nversion = \"local\"" >LocalPreferences.toml
2922
if: build.message !~ /\[skip tests\]/ &&
3023
build.message !~ /\[skip julia\]/
3124
timeout_in_minutes: 120
3225
matrix:
3326
setup:
3427
julia:
35-
- "1.7"
3628
- "1.8"
3729
- "1.9"
3830
- "1.10-nightly"
@@ -79,12 +71,8 @@ steps:
7971
- "11.6"
8072
- "11.5"
8173
- "11.4"
82-
- "11.3"
83-
- "11.2"
84-
- "11.1"
85-
- "11.0"
8674
commands: |
87-
julia --project -e 'using CUDA; CUDA.set_runtime_version!(v"{{matrix.cuda}}")'
75+
echo -e "[CUDA_Runtime_jll]\nversion = \"{{matrix.cuda}}\"" >LocalPreferences.toml
8876
8977
- group: ":nesting_dolls: Subpackages"
9078
depends_on: "cuda"
@@ -93,7 +81,7 @@ steps:
9381
matrix:
9482
setup:
9583
cuda:
96-
- "11.0"
84+
- "11.4"
9785
package:
9886
- "cuDNN"
9987
- "cuTENSOR"
@@ -124,21 +112,25 @@ steps:
124112
commands: |
125113
julia -e '
126114
using Pkg
115+
Pkg.activate(joinpath(pwd(), "lib", lowercase("{{matrix.package}}")))
127116
128117
println("--- :julia: Instantiating project")
129-
Pkg.activate(joinpath(pwd(), "lib", lowercase("{{matrix.package}}")))
130-
if "{{matrix.package}}" == "cuTensorNet"
131-
# HACK: cuTensorNet depends on a development version of cuTENSOR
132-
Pkg.develop(path=joinpath(pwd(), "lib", "cutensor"))
133-
end
134-
Pkg.develop(path=pwd())
135-
Pkg.instantiate()
118+
withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
119+
pkgs = [PackageSpec(path=pwd())]
120+
if "{{matrix.package}}" == "cuTensorNet"
121+
# cuTensorNet depends on a development version of cuTENSOR
122+
push!(pkgs, PackageSpec(path=joinpath(pwd(), "lib", "cutensor")))
123+
end
124+
Pkg.develop(pkgs)
125+
Pkg.instantiate()
136126
137-
using CUDA
138-
CUDA.set_runtime_version!(v"{{matrix.cuda}}")
127+
Pkg.add("CUDA_Runtime_jll")
128+
write(joinpath(pwd(), "lib", lowercase("{{matrix.package}}"), "LocalPreferences.toml"),
129+
"[CUDA_Runtime_jll]\nversion = \"{{matrix.cuda}}\"")
130+
end
139131
140132
println("+++ :julia: Running tests")
141-
Pkg.test()'
133+
Pkg.test(coverage=true)'
142134
143135
- group: ":telescope: Downstream"
144136
depends_on: "cuda"
@@ -157,16 +149,21 @@ steps:
157149
using Pkg
158150
159151
println("--- :julia: Instantiating project")
160-
Pkg.develop(path=pwd())
161-
Pkg.develop(path=joinpath(pwd(), "lib", "cudnn"))
162-
Pkg.add(name="NNlibCUDA", rev="master")
163-
Pkg.instantiate()
152+
withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
153+
Pkg.develop("NNlibCUDA")
154+
Pkg.activate("NNlibCUDA")
164155
165-
using CUDA
166-
CUDA.set_runtime_version!(v"12.0")
156+
Pkg.develop([PackageSpec(path=pwd()),
157+
PackageSpec(path=joinpath(pwd(), "lib", "cudnn"))])
158+
Pkg.instantiate()
159+
160+
Pkg.add("CUDA_Runtime_jll")
161+
write(joinpath(Pkg.devdir(), "NNlibCUDA", "LocalPreferences.toml"),
162+
"[CUDA_Runtime_jll]\nversion = \"12.0\"")
163+
end
167164
168165
println("+++ :julia: Running tests")
169-
Pkg.test("NNlibCUDA"; coverage=true)'
166+
Pkg.test(coverage=true)'
170167
agents:
171168
queue: "juliagpu"
172169
cuda: "*"
@@ -262,8 +259,9 @@ steps:
262259
version: 1.9
263260
command: |
264261
julia --project -e '
265-
println("--- :julia: Instantiating project")
266262
using Pkg
263+
264+
println("--- :julia: Instantiating project")
267265
Pkg.instantiate()
268266
Pkg.activate("perf")
269267
Pkg.instantiate()
@@ -293,10 +291,10 @@ steps:
293291
CODESPEED_EXECUTABLE: "Julia {{matrix.julia}}"
294292
command: |
295293
julia --project -e '
294+
using Pkg
296295
ENV["CODESPEED_ENVIRONMENT"] = ENV["BUILDKITE_AGENT_NAME"]
297296
298297
println("--- :julia: Instantiating project")
299-
using Pkg
300298
Pkg.resolve()
301299
Pkg.instantiate()
302300
Pkg.activate("perf")
@@ -314,7 +312,6 @@ steps:
314312
matrix:
315313
setup:
316314
julia:
317-
- "1.7"
318315
- "1.8"
319316
- "1.9"
320317
- "1.10"
@@ -326,7 +323,7 @@ steps:
326323
timeout_in_minutes: 30
327324

328325
env:
329-
JULIA_PKG_SERVER: "" # we don't want to wait until the PkgServer updates
326+
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: "eager" # OK to downloading JLLs from GitHub
330327
SECRET_CODECOV_TOKEN: "o43LveCldXhMUteqc2AzdL+dx51CUYz2L/6j+WjSr4lbLb0t/SfpWEPJzrymGgYnQ09hR7otPNShA+40ew6yRMRV7TSgm6ZgdbNeum7drjEMAqX3knKgqbTtvPqgjkQiaXNzSWuJfrsfFb32bkj/iXAoIEdBrpVSYHCb95cf1O10LBTFRlH8AAGzsk9Tvc1cIOl3Wdp34KDLKwIzFYTF405QhgtBwwopaC5DRIuUNuLJ/wPOif4rF1OOMUkPCiTFb2HflpGRhiRvKuj34WwNu/+HEE2pmmLQnKPcJOsg+iPvFY4U/prlKkU3fNtgeE4FTmMSorOZT94sycUfvBMWig==;U2FsdGVkX18MIdzVE4KsKHgrhuS5QdfrSe+0ft4jlDZZcmJfrR0AT7RuRf8TPeFDw3R8qUNuwuZVrkZPJSDBgQ=="
331328
SECRET_DOCUMENTER_KEY: "S8anhJOWaY9lHcH/G1W5QI80qOg6oR0boF7LdbseDhb8PpMjKWrWA0s2FEqcxq1euftXpgKf3Q434bJvwoh0iKX0DZxRDuuKcQ7UDDqskOxcznliL9yQS8cInVYXir02iAnDROYQbpD2r5Ek4W9AxZUy6/mPJJkfZYz8W0b1SSPMpzsq88FkF4h4/ZxXiXLWluwQT+lyknExQ487wj2S5CnWszIRVJDX/eHQLW/WCOAh9gQsoTj/Xu+CfI1/TqwbTcpiceo5WuPz7CZ1cJolRW68CSuwnRv7q5MBrOytSdtvHu7E9CHk3WFCYlnLN5S8i4SMtg5NmYYqVmz/oUn9ag==;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"
332329
SECRET_CODESPEED_SERVER: "n6tQqMwRA5WJZXPT9sVmKBFR+xGwoq2DMlhGIQLETkyTbvNLAgRERcMR7Udxz4nEN321Ieo7U6/vwPWeDnzhsv+Qcx9jEK0BgWvJ1iDyPYxw/x2yrrP4OnFyEyl0sydHjpDSMakvSCqu5E3YW0J0eN2eSVg0BtoNqSD7BCRh3Fh2lHrEVD8FjZLhdR2lSepJBwWhN3QjK+2RsNEMJJKAQTimDJxqPr+9UDNr1Zhiy2Yn3H4aV4TZ6XX2ioCVTG7rI3VjFjFWNJ6kwQIW0MEcF56OIhnuNEgGNIvegsrkhitKvWUxeeuYEY6imfSvKm2Ljyw5RY3UHvqxg82hrWx2tw==;U2FsdGVkX19Pf6SMbEv9EN/rv6GwO3NMzFSjoE4G5FNaGMLyKOieku7o2jCFju46wt4hF7KvpHXZFAr0azbT42nWZromLvmrrZnumUuVW98="

0 commit comments

Comments
 (0)