Skip to content

Commit

Permalink
Remove cruft (#384)
Browse files Browse the repository at this point in the history
* Adopt Julia 1.10+, slim package

This eliminates `@snoopc`, `@snoopi`, `SnoopCompileBot`,
and `SnoopPrecompile`. These are legacy tools that aren't needed
anymore. It also moves all conditional code to extension
modules and eliminates the dependency on Requires.
  • Loading branch information
timholy committed Apr 18, 2024
1 parent a2e9d89 commit 3de7217
Show file tree
Hide file tree
Showing 44 changed files with 285 additions and 2,156 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
defaults:
run:
shell: bash
concurrency:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
Expand All @@ -20,10 +20,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.0'
- '1.2'
- '1.4'
- '1.6'
- '1.10'
- '1'
- 'nightly'
os:
Expand All @@ -50,13 +47,11 @@ jobs:
${{ runner.os }}-test-
${{ runner.os }}-
- run: julia --project -e 'using Pkg; Pkg.develop([PackageSpec(path="SnoopCompileCore")])'
- run: julia --project -e 'using Pkg; Pkg.develop([PackageSpec(path="SnoopPrecompile")])'
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
- run: julia --project=SnoopPrecompile -e 'using Pkg; Pkg.test(; coverage=true)'
- uses: julia-actions/julia-processcoverage@v1
with:
directories: src,SnoopCompileCore/src,SnoopPrecompile/src
directories: src,SnoopCompileCore/src
- uses: codecov/codecov-action@v4
with:
file: lcov.info
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,13 @@ This version implements major changes in how `parcel` works on the output of `@s

Other changes:
- A convenience utility, `timesum`, was introduced (credit to aminya)

## Version 3

Version 3 is a greatly slimmed repository, focusing just on those tools that are relevant for modern Julia development.
Users of tools that were removed should stick with SnoopCompile 2.x.

- The old `@snoopc` has been deleted. Its functionality was largely subsumed into `julia --trace-compile`.
-`@snoopi` has been deleted, as `@snoopi_deep` provides more comprehensive information and is available on all modern Julia versions.
- SnoopCompileBot was deleted in favor of [CompileBot](https://github.com/aminya/CompileBot.jl)
- SnoopPrecompile was deleted because it is now [PrecompileTools](https://github.com/JuliaLang/PrecompileTools.jl)
24 changes: 12 additions & 12 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SnoopCompile"
uuid = "aa65fe97-06da-5843-b5b1-d5d13cad87d2"
author = ["Tim Holy <tim.holy@gmail.com>"]
version = "2.10.8"
author = ["Tim Holy <tim.holy@gmail.com>", "Shuhei Kadowaki <aviatesk@gmail.com>"]
version = "3.0.0"

[deps]
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
Expand All @@ -11,34 +11,34 @@ OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034"
YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"

[weakdeps]
Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"

[extensions]
CthulhuExt = "Cthulhu"
JETExt = ["JET", "Cthulhu"]
SCPrettyTablesExt = "PrettyTables"
SCPyPlotExt = "PyPlot"

[compat]
AbstractTrees = "0.3, 0.4"
Cthulhu = "1.5, 2"
FlameGraphs = "0.2, 1"
AbstractTrees = "0.4"
Cthulhu = "2"
FlameGraphs = "1"
OrderedCollections = "1"
Requires = "1"
SnoopCompileCore = "~2.10.0"
SnoopCompileCore = "3"
YAML = "0.4"
julia = "1"
julia = "1.10"

[extras]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
MethodAnalysis = "85b6ec6f-f7df-4429-9514-a64bcd9ee824"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand All @@ -47,4 +47,4 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ColorTypes", "Cthulhu", "PrettyTables", "Documenter", "FixedPointNumbers", "JET", "MethodAnalysis", "Pkg", "Random", "Test"]
test = ["Cthulhu", "PrettyTables", "Documenter", "JET", "MethodAnalysis", "Pkg", "Random", "Test"]
2 changes: 1 addition & 1 deletion SnoopCompileCore/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SnoopCompileCore"
uuid = "e2b509da-e806-4183-be48-004708413034"
author = ["Tim Holy <tim.holy@gmail.com>"]
version = "2.10.1"
version = "3.0.0"

[deps]
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Expand Down
23 changes: 3 additions & 20 deletions SnoopCompileCore/src/SnoopCompileCore.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,8 @@ module SnoopCompileCore

using Core: MethodInstance, CodeInfo

# @snoopi and @snoopc are exported from their files of definition


include("snoopc.jl")

if VERSION >= v"1.2.0-DEV.573"
include("snoopi.jl")
end

if VERSION >= v"1.6.0-DEV.1190" # https://github.com/JuliaLang/julia/pull/37749
include("snoopi_deep.jl")
end

if VERSION >= v"1.6.0-DEV.154"
include("snoopr.jl")
end

if VERSION >= v"1.6.0-DEV.1192" # https://github.com/JuliaLang/julia/pull/37136
include("snoopl.jl")
end
include("snoopi_deep.jl")
include("snoopr.jl")
include("snoopl.jl")

end
48 changes: 0 additions & 48 deletions SnoopCompileCore/src/snoopc.jl

This file was deleted.

104 changes: 0 additions & 104 deletions SnoopCompileCore/src/snoopi.jl

This file was deleted.

2 changes: 2 additions & 0 deletions SnoopCompileCore/src/snoopi_deep.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export @snoopi_deep

struct InferenceTiming
mi_info::Core.Compiler.Timings.InferenceFrameInfo
inclusive_time::Float64
Expand Down
21 changes: 0 additions & 21 deletions SnoopPrecompile/LICENSE

This file was deleted.

18 changes: 0 additions & 18 deletions SnoopPrecompile/Project.toml

This file was deleted.

5 changes: 0 additions & 5 deletions SnoopPrecompile/README.md

This file was deleted.

Loading

0 comments on commit 3de7217

Please sign in to comment.