From ad020662861d1304ca87ed4d4f61917e00a0aafa Mon Sep 17 00:00:00 2001 From: Karl Pierce Date: Tue, 2 Jul 2024 11:47:02 +0200 Subject: [PATCH] Having JLArrays when testing GPUs creates an issue in test --- NDTensors/test/NDTensorsTestUtils/device_list.jl | 5 ++++- NDTensors/test/Project.toml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NDTensors/test/NDTensorsTestUtils/device_list.jl b/NDTensors/test/NDTensorsTestUtils/device_list.jl index e798d04c46..875eab94a9 100644 --- a/NDTensors/test/NDTensorsTestUtils/device_list.jl +++ b/NDTensors/test/NDTensorsTestUtils/device_list.jl @@ -1,5 +1,4 @@ using Pkg: Pkg -using JLArrays: JLArrays, jl using NDTensors: NDTensors if "cuda" in ARGS || "all" in ARGS @@ -26,6 +25,10 @@ if "cutensor" in ARGS || "all" in ARGS Pkg.add("CUDA") using CUDA, cuTENSOR end +if isempty(ARGS) || "base" in ARGS + Pkg.add("JLArrays") + using JLArrays: jl +end function devices_list(test_args) devs = Vector{Function}(undef, 0) diff --git a/NDTensors/test/Project.toml b/NDTensors/test/Project.toml index ef1954abb3..b1826e9588 100644 --- a/NDTensors/test/Project.toml +++ b/NDTensors/test/Project.toml @@ -9,7 +9,6 @@ EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527" ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5" -JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf" @@ -30,5 +29,6 @@ cuTENSOR = "2.0" [extras] AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e" +JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" Metal = "dde4c033-4e86-420c-a63e-0dd931031962" cuTENSOR = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"