From 8c78e6d8c8fbd2a91e912ccd387c890681e18824 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Thu, 10 Feb 2022 05:51:16 -0500 Subject: [PATCH 1/6] Test on current stable release instead of nightly Nightly is not generally going to work with autodiff, while this was not testing on current stable release (v1.7) which is what most users are likely on. We usually prefer to test on stable + LTS. --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1eac609..1ad2c63 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ jobs: matrix: version: - '1.6' - - 'nightly' + - '1' os: - ubuntu-latest arch: @@ -56,4 +56,4 @@ jobs: using Documenter: DocMeta, doctest using OperatorLearning DocMeta.setdocmeta!(OperatorLearning, :DocTestSetup, :(using OperatorLearning); recursive=true) - doctest(OperatorLearning)' \ No newline at end of file + doctest(OperatorLearning)' From 13131b92a68a587dd884d99a1c853e5d96a6136d Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Thu, 10 Feb 2022 05:52:45 -0500 Subject: [PATCH 2/6] don't double test --- .github/workflows/CI.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1ad2c63..e8a6f15 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,7 +1,11 @@ name: CI on: - - push - - pull_request + pull_request: + branches: + - master + push: + branches: + - master jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} From 474c705417d1364b5739276db7ce1e9fb088564d Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Thu, 10 Feb 2022 06:29:39 -0500 Subject: [PATCH 3/6] Fix up tests and dependencies --- Project.toml | 11 ++++++----- test/runtests.jl | 10 ++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 6879274..ce5050f 100644 --- a/Project.toml +++ b/Project.toml @@ -7,13 +7,9 @@ version = "0.2.1" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -MAT = "23992714-dd62-5051-b70f-ba57cb901cac" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" OMEinsum = "ebe7aa44-baf0-506c-a96f-8464559b3922" -PkgTemplates = "14b8a8f1-9102-5b29-a752-f990bacb7fe1" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] CUDA = "3" @@ -22,6 +18,11 @@ Flux = "0.12" MAT = "0.10" NNlib = "0.8" OMEinsum = "0.6" -PkgTemplates = "0.7" Revise = "3" julia = "1.6" + +[extras] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test"] diff --git a/test/runtests.jl b/test/runtests.jl index 1d4ab2a..0294fd7 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,9 +1,14 @@ +using Pkg +const LONGER_TESTS = false +const GROUP = get(ENV, "GROUP", "All") + using OperatorLearning using Test using Random Random.seed!(0) +if GROUP == "All" || GROUP == "Core" @testset "FourierLayer" begin include("fourierlayer.jl") end @@ -15,3 +20,8 @@ end @testset "Weights" begin include("complexweights.jl") end +end + +if GROUP == "GPU" + # Add GPU Tests Here +end From d70ee261d194884ae2497593393ac4f090e84b73 Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Thu, 10 Feb 2022 06:32:25 -0500 Subject: [PATCH 4/6] remove mat.jl compat --- Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Project.toml b/Project.toml index ce5050f..675087d 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,6 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" CUDA = "3" FFTW = "1" Flux = "0.12" -MAT = "0.10" NNlib = "0.8" OMEinsum = "0.6" Revise = "3" From b11347a5f0d11fa81a60137f642012802d8150f4 Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Thu, 10 Feb 2022 06:34:10 -0500 Subject: [PATCH 5/6] no revise either --- Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Project.toml b/Project.toml index 675087d..5e67550 100644 --- a/Project.toml +++ b/Project.toml @@ -17,7 +17,6 @@ FFTW = "1" Flux = "0.12" NNlib = "0.8" OMEinsum = "0.6" -Revise = "3" julia = "1.6" [extras] From 65c7a48dba055d55cdb5f5729c26c6390d193af0 Mon Sep 17 00:00:00 2001 From: Chris Rackauckas Date: Thu, 10 Feb 2022 06:36:42 -0500 Subject: [PATCH 6/6] add Pkg to test deps --- Project.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 5e67550..8435bc7 100644 --- a/Project.toml +++ b/Project.toml @@ -20,7 +20,8 @@ OMEinsum = "0.6" julia = "1.6" [extras] +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Test"] +test = ["Pkg", "Test"]