From 153f298d20aeb864c6f45e3a02d27ec75c313c8c Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Tue, 14 Mar 2023 07:44:24 -0700 Subject: [PATCH 1/5] Actually make sure conda env dir is set on Buildkite CI The original fix was incorrect due to https://buildkite.com/docs/pipelines/environment-variables#runtime-variable-interpolation, but happened to pass by coincidence. --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8b7f20dac..5e2ae545d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: version: "1.6" - JuliaCI/julia-test#v1: ~ command: - - mkdir -p "${JULIA_DEPOT_PATH}/conda/3/x86_64" + - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" cuda: "*" @@ -17,7 +17,7 @@ steps: version: "1" - JuliaCI/julia-test#v1: ~ command: - - mkdir -p "${JULIA_DEPOT_PATH}/conda/3/x86_64" + - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" cuda: "*" From 4ae6402a13503e30ed1b4978d2a4493416acaf43 Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Tue, 14 Mar 2023 21:11:22 -0700 Subject: [PATCH 2/5] Update pipeline.yml test --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 5e2ae545d..0c2739edd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -17,6 +17,7 @@ steps: version: "1" - JuliaCI/julia-test#v1: ~ command: + - ls "$${JULIA_DEPOT_PATH}" - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" From d2e71d1139515e8786a61f6fc7cd40dfa41a331b Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Tue, 14 Mar 2023 22:19:21 -0700 Subject: [PATCH 3/5] make sure Conda Python is installed --- .buildkite/pipeline.yml | 1 - Project.toml | 3 ++- test/features.jl | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 0c2739edd..5e2ae545d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -17,7 +17,6 @@ steps: version: "1" - JuliaCI/julia-test#v1: ~ command: - - ls "$${JULIA_DEPOT_PATH}" - mkdir -p "$${JULIA_DEPOT_PATH}/conda/3/x86_64" agents: queue: "juliagpu" diff --git a/Project.toml b/Project.toml index 64b79bca0..ee5a7b371 100644 --- a/Project.toml +++ b/Project.toml @@ -61,6 +61,7 @@ julia = "1.6" [extras] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" +Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a" Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" @@ -71,4 +72,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" [targets] -test = ["ChainRulesTestUtils", "CUDA", "Distances", "FFTW", "FiniteDifferences", "PyCall", "Test"] +test = ["ChainRulesTestUtils", "Conda", "CUDA", "Distances", "FFTW", "FiniteDifferences", "PyCall", "Test"] diff --git a/test/features.jl b/test/features.jl index 77a9b7165..78f496721 100644 --- a/test/features.jl +++ b/test/features.jl @@ -682,6 +682,10 @@ end end @testset "PyCall custom @adjoint" begin + # Trigger Python install if required. Required for Buildkite CI! + import Conda + Conda.list() + import PyCall math = PyCall.pyimport("math") pysin(x) = math.sin(x) From 7ceccceef93e85f0c6a6cd27afbf0b3b15790af3 Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Wed, 15 Mar 2023 12:17:47 -0700 Subject: [PATCH 4/5] re-trigger to re-test --- test/features.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/features.jl b/test/features.jl index 78f496721..7197974fc 100644 --- a/test/features.jl +++ b/test/features.jl @@ -684,7 +684,7 @@ end @testset "PyCall custom @adjoint" begin # Trigger Python install if required. Required for Buildkite CI! import Conda - Conda.list() + Conda.list() import PyCall math = PyCall.pyimport("math") From 2a24e184e514d01d11711069538a76fcf390f2ec Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Wed, 15 Mar 2023 15:15:09 -0700 Subject: [PATCH 5/5] encore --- test/features.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/features.jl b/test/features.jl index 7197974fc..78f496721 100644 --- a/test/features.jl +++ b/test/features.jl @@ -684,7 +684,7 @@ end @testset "PyCall custom @adjoint" begin # Trigger Python install if required. Required for Buildkite CI! import Conda - Conda.list() + Conda.list() import PyCall math = PyCall.pyimport("math")