From 4c5e9828af8e86fe3a1d90295e20992c9372a435 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Sun, 7 Jul 2024 01:19:01 +0200 Subject: [PATCH 1/5] Set PYTHON env variable in buildkite runs --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 2b1c7e61..ec037fa2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,3 +14,4 @@ steps: env: GROUP: GPU + PYTHON: '' From d1f2c3f2ae1172f83d2c3db5bd83cdcd57421525 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Sun, 7 Jul 2024 01:31:29 +0200 Subject: [PATCH 2/5] Create conda dir (copied from Zygote) --- .buildkite/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ec037fa2..4b6cdb0f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,6 +5,8 @@ steps: version: "1" - JuliaCI/julia-test#v1: coverage: false + command: + - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" cuda: "*" @@ -14,4 +16,3 @@ steps: env: GROUP: GPU - PYTHON: '' From 01fb9034930e1306221772e40d2091c64547dfd0 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Sun, 7 Jul 2024 01:34:59 +0200 Subject: [PATCH 3/5] Set env variable --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 4b6cdb0f..fca2f4ff 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,6 +3,7 @@ steps: plugins: - JuliaCI/julia#v1: version: "1" + python: "" - JuliaCI/julia-test#v1: coverage: false command: From a36ed54ef329b15dd004127637b16d8b021b31bb Mon Sep 17 00:00:00 2001 From: David Widmann Date: Sun, 7 Jul 2024 01:37:58 +0200 Subject: [PATCH 4/5] Revert command --- .buildkite/pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index fca2f4ff..5e7221be 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -6,8 +6,6 @@ steps: python: "" - JuliaCI/julia-test#v1: coverage: false - command: - - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" cuda: "*" From fda33fe411231374753be55ba40e698db035a168 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Sun, 7 Jul 2024 01:46:00 +0200 Subject: [PATCH 5/5] Load Conda --- .buildkite/pipeline.yml | 3 ++- Project.toml | 3 ++- test/runtests.jl | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 5e7221be..4b6cdb0f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,9 +3,10 @@ steps: plugins: - JuliaCI/julia#v1: version: "1" - python: "" - JuliaCI/julia-test#v1: coverage: false + command: + - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" cuda: "*" diff --git a/Project.toml b/Project.toml index 3c57e214..469077ed 100644 --- a/Project.toml +++ b/Project.toml @@ -20,6 +20,7 @@ Reexport = "1" julia = "1" [extras] +Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d" Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" @@ -31,4 +32,4 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Distances", "ForwardDiff", "ReverseDiff", "Pkg", "PythonOT", "Random", "SafeTestsets", "Test", "StatsBase"] +test = ["Conda", "Distances", "ForwardDiff", "ReverseDiff", "Pkg", "PythonOT", "Random", "SafeTestsets", "Test", "StatsBase"] diff --git a/test/runtests.jl b/test/runtests.jl index 66314dfa..872a5964 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,3 +1,7 @@ +# Trigger Python install if required. Required for Buildkite CI! +using Conda: Conda +Conda.list() + using OptimalTransport using Pkg: Pkg using SafeTestsets