Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove NeuralPDELogging in-favor of extension #901

Merged
merged 1 commit into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
steps:
- label: "GPU"
- label: "CUDA"
plugins:
- JuliaCI/julia#v1:
version: "1"
- JuliaCI/julia-test#v1:
coverage: false # 1000x slowdown
coverage: true
agents:
queue: "juliagpu"
cuda: "*"
env:
GROUP: 'GPU'
GROUP: 'CUDA'
JULIA_PKG_SERVER: "" # it often struggles with our large artifacts
# SECRET_CODECOV_TOKEN: "..."
timeout_in_minutes: 240
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
- name: CompatHelper.main()
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: julia -e 'using CompatHelper; CompatHelper.main(;subdirs=["", "docs", "lib/NeuralPDELogging"])'
run: julia -e 'using CompatHelper; CompatHelper.main(;subdirs=["", "docs"])'
2 changes: 1 addition & 1 deletion .github/workflows/Downgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
GROUP: ${{ matrix.group }}
- uses: julia-actions/julia-processcoverage@v1
with:
directories: src,lib/NeuralPDELogging/src
directories: src,ext
- uses: codecov/codecov-action@v4
with:
files: lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ jobs:
uses: "SciML/.github/.github/workflows/tests.yml@v1"
with:
group: "${{ matrix.group }}"
coverage-directories: "src,lib/NeuralPDELogging/src"
coverage-directories: "src,ext"
julia-version: "${{ matrix.version }}"
secrets: "inherit"
10 changes: 9 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
WeightInitializers = "d49dbf32-c5c2-4618-8acc-27bb2598ef2d"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[weakdeps]
TensorBoardLogger = "899adc3e-224a-11e9-021f-63837185c80f"

[extensions]
NeuralPDETensorBoardLoggerExt = "TensorBoardLogger"

[compat]
ADTypes = "1.9.0"
Adapt = "4"
Expand Down Expand Up @@ -96,6 +102,7 @@ StochasticDiffEq = "6.69.1"
SymbolicIndexingInterface = "0.3.31"
SymbolicUtils = "3.7.2"
Symbolics = "6.14"
TensorBoardLogger = "0.1.24"
Test = "1.10"
WeightInitializers = "1.0.3"
Zygote = "0.6.71"
Expand All @@ -117,7 +124,8 @@ OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
TensorBoardLogger = "899adc3e-224a-11e9-021f-63837185c80f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "CUDA", "DiffEqNoiseProcess", "ExplicitImports", "Flux", "LineSearches", "LuxCUDA", "LuxCore", "LuxLib", "MethodOfLines", "OptimizationOptimJL", "OrdinaryDiffEq", "Pkg", "SafeTestsets", "StochasticDiffEq", "Test"]
test = ["Aqua", "CUDA", "DiffEqNoiseProcess", "ExplicitImports", "Flux", "LineSearches", "LuxCUDA", "LuxCore", "LuxLib", "MethodOfLines", "OptimizationOptimJL", "OrdinaryDiffEq", "Pkg", "SafeTestsets", "StochasticDiffEq", "TensorBoardLogger", "Test"]
19 changes: 19 additions & 0 deletions ext/NeuralPDETensorBoardLoggerExt.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module NeuralPDETensorBoardLoggerExt

using NeuralPDE: NeuralPDE
using TensorBoardLogger: TBLogger, log_value

function NeuralPDE.logvector(logger::TBLogger, vector::AbstractVector{<:Real},
name::AbstractString, step::Integer)
foreach(enumerate(vector)) do (j, v)
log_value(logger, "$(name)/$(j)", v; step)
end
end

function NeuralPDE.logscalar(logger::TBLogger, scalar::Real, name::AbstractString,
step::Integer)
log_value(logger, "$(name)", scalar; step)
return nothing
end

end
9 changes: 0 additions & 9 deletions lib/NeuralPDELogging/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions lib/NeuralPDELogging/Project.toml

This file was deleted.

24 changes: 0 additions & 24 deletions lib/NeuralPDELogging/src/NeuralPDELogging.jl

This file was deleted.

130 changes: 0 additions & 130 deletions lib/NeuralPDELogging/test/adaptive_loss_log_tests.jl

This file was deleted.

45 changes: 0 additions & 45 deletions lib/NeuralPDELogging/test/runtests.jl

This file was deleted.

11 changes: 2 additions & 9 deletions src/pinn_types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ end

LogOptions(; log_frequency = 50) = LogOptions(log_frequency)

"""This function is defined here as stubs to be overridden by the subpackage NeuralPDELogging if imported"""
function logvector(logger, v::AbstractVector{<:Real}, name::AbstractString, step::Integer)
nothing
end

"""This function is defined here as stubs to be overridden by the subpackage NeuralPDELogging if imported"""
function logscalar(logger, s::Real, name::AbstractString, step::Integer)
nothing
end
logvector(logger, v::AbstractVector{<:Real}, name::AbstractString, step::Integer) = nothing
logscalar(logger, s::Real, name::AbstractString, step::Integer) = nothing

"""
An encoding of the test function phi that is used for calculating the PDE
Expand Down
Loading
Loading