Skip to content

Commit

Permalink
Reexport StatGeochemBase
Browse files Browse the repository at this point in the history
  • Loading branch information
@brenhinkeller
brenhinkeller committed Nov 8, 2024
1 parent 83cb3dc commit f2a3294
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 47 deletions.
2 changes: 2 additions & 0 deletions Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ version = "0.10.2"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
StatGeochemBase = "61e559cd-58b4-4257-8528-26bb26ff2b9a"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
VectorizedStatistics = "3b853605-1c98-4422-8364-4bd93ee0529e"
Expand All @@ -15,6 +16,7 @@ VectorizedStatistics = "3b853605-1c98-4422-8364-4bd93ee0529e"
LinearAlgebra = "1.11"
LoopVectorization = "0.12"
ProgressMeter = "1"
Reexport = "1"
StatGeochemBase = "0.4.3, 0.5, 0.6"
VectorizedStatistics = "0.4.6, 0.5"
julia = "1.11"
60 changes: 17 additions & 43 deletions examples/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.11.1"
manifest_format = "2.0"
project_hash = "fabe1b01f49c2da43368937f824ad20094af6180"
project_hash = "235222cc58b50c0d9bbf3a60a2047ae3cb738917"

[[deps.AbstractFFTs]]
deps = ["LinearAlgebra"]
Expand Down Expand Up @@ -37,15 +37,16 @@ version = "0.4.0"

[[deps.ArrayInterface]]
deps = ["Adapt", "LinearAlgebra"]
git-tree-sha1 = "3640d077b6dafd64ceb8fd5c1ec76f7ca53bcf76"
git-tree-sha1 = "d60a1922358aa203019b7857a2c8c37329b8736c"
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
version = "7.16.0"
version = "7.17.0"

[deps.ArrayInterface.extensions]
ArrayInterfaceBandedMatricesExt = "BandedMatrices"
ArrayInterfaceBlockBandedMatricesExt = "BlockBandedMatrices"
ArrayInterfaceCUDAExt = "CUDA"
ArrayInterfaceCUDSSExt = "CUDSS"
ArrayInterfaceChainRulesCoreExt = "ChainRulesCore"
ArrayInterfaceChainRulesExt = "ChainRules"
ArrayInterfaceGPUArraysCoreExt = "GPUArraysCore"
ArrayInterfaceReverseDiffExt = "ReverseDiff"
Expand All @@ -59,6 +60,7 @@ version = "7.16.0"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e"
ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2"
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Expand Down Expand Up @@ -433,9 +435,9 @@ version = "2.80.5+0"

[[deps.Graphics]]
deps = ["Colors", "LinearAlgebra", "NaNMath"]
git-tree-sha1 = "d61890399bc535850c4bf08e4e0d3a7ad0f21cbd"
git-tree-sha1 = "a641238db938fff9b2f60d08ed9030387daf428c"
uuid = "a2bd30eb-e257-5431-a919-1863eab51364"
version = "1.1.2"
version = "1.1.3"

[[deps.Graphite2_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
Expand Down Expand Up @@ -480,9 +482,9 @@ version = "1.14.2+1"

[[deps.HTTP]]
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
git-tree-sha1 = "bc3f416a965ae61968c20d0ad867556367f2817d"
git-tree-sha1 = "1336e07ba2eb75614c99496501a8f4b233e9fafe"
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
version = "1.10.9"
version = "1.10.10"

[[deps.HarfBuzz_jll]]
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll"]
Expand All @@ -504,9 +506,9 @@ version = "0.1.17"

[[deps.Hwloc_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "dd3b49277ec2bb2c6b94eb1604d4d0616016f7a6"
git-tree-sha1 = "50aedf345a709ab75872f80a2779568dc0bb461b"
uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8"
version = "2.11.2+0"
version = "2.11.2+1"

[[deps.IfElse]]
git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1"
Expand Down Expand Up @@ -1066,9 +1068,9 @@ version = "0.3.27+1"

[[deps.OpenEXR]]
deps = ["Colors", "FileIO", "OpenEXR_jll"]
git-tree-sha1 = "327f53360fdb54df7ecd01e96ef1983536d1e633"
git-tree-sha1 = "97db9e07fe2091882c765380ef58ec553074e9c7"
uuid = "52e1d378-f018-4a11-a4be-720524705ac7"
version = "0.3.2"
version = "0.3.3"

[[deps.OpenEXR_jll]]
deps = ["Artifacts", "Imath_jll", "JLLWrappers", "Libdl", "Zlib_jll"]
Expand Down Expand Up @@ -1157,12 +1159,6 @@ git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "2.8.1"

[[deps.Perple_X_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
git-tree-sha1 = "6d95cb1275528ca068a854502cc6ac3fbde8e75a"
uuid = "9c18f8f7-1c8d-5a34-9fc2-3ecefed5c104"
version = "7.1.8+0"

[[deps.Pipe]]
git-tree-sha1 = "6842804e7867b115ca9de748a0cf6b364523c16d"
uuid = "b98c9c47-44ae-5843-9183-064241ee97a0"
Expand Down Expand Up @@ -1221,12 +1217,6 @@ version = "1.40.8"
ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[[deps.Polyester]]
deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"]
git-tree-sha1 = "6d38fea02d983051776a856b7df75b30cf9a3c1f"
uuid = "f517fe37-dbe3-4b94-8317-1923a5111588"
version = "0.7.16"

[[deps.PolyesterWeave]]
deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"]
git-tree-sha1 = "645bed98cd47f72f67316fd42fc47dee771aefcd"
Expand Down Expand Up @@ -1276,9 +1266,9 @@ version = "1.10.2"

[[deps.QOI]]
deps = ["ColorTypes", "FileIO", "FixedPointNumbers"]
git-tree-sha1 = "18e8f4d1426e965c7b532ddd260599e1510d26ce"
git-tree-sha1 = "8b3fc30bc0390abdce15f8822c889f669baed73d"
uuid = "4b34888f-f399-49d4-9bb3-47ed5cae4e65"
version = "1.0.0"
version = "1.0.1"

[[deps.Qt6Base_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Vulkan_Loader_jll", "Xorg_libSM_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_cursor_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "libinput_jll", "xkbcommon_jll"]
Expand Down Expand Up @@ -1494,16 +1484,6 @@ git-tree-sha1 = "46e589465204cd0c08b4bd97385e4fa79a0c770c"
uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15"
version = "0.1.1"

[[deps.StatGeochem]]
deps = ["Colors", "DelimitedFiles", "Downloads", "FileIO", "HDF5", "ImageIO", "LazyArtifacts", "LoopVectorization", "NaNStatistics", "Perple_X_jll", "Polyester", "ProgressMeter", "Random", "Reexport", "StatGeochemBase", "Statistics"]
git-tree-sha1 = "a26a9b0ad9ea4781c89a25b7e98323e218e1e5c8"
uuid = "df4de05a-b714-11e8-3c2a-c30fb13e804c"
version = "0.8.1"
weakdeps = ["Plots"]

[deps.StatGeochem.extensions]
StatGeochemPlotsExt = "Plots"

[[deps.StatGeochemBase]]
deps = ["Colors", "DelimitedFiles", "IndirectArrays", "NaNStatistics", "SpecialFunctions"]
git-tree-sha1 = "f1bbf1b11811ff46babf040af96d0db939ad7632"
Expand Down Expand Up @@ -1565,12 +1545,6 @@ git-tree-sha1 = "5cf7606d6cef84b543b483848d4ae08ad9832b21"
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
version = "0.34.3"

[[deps.StrideArraysCore]]
deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"]
git-tree-sha1 = "f35f6ab602df8413a50c4a25ca14de821e8605fb"
uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da"
version = "0.5.7"

[[deps.StyledStrings]]
uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
version = "1.11.0"
Expand Down Expand Up @@ -1603,11 +1577,11 @@ version = "1.11.0"

[[deps.Thermochron]]
deps = ["LinearAlgebra", "LoopVectorization", "ProgressMeter", "StatGeochemBase", "Statistics", "VectorizedStatistics"]
git-tree-sha1 = "239e57ae4c9279b120a691f75b82a006abebf6d1"
git-tree-sha1 = "b85837ea700d9b4e1c390bf4a710e9fa1b9dc8e0"
repo-rev = "main"
repo-url = "https://github.com/OpenThermochronology/Thermochron.jl.git"
uuid = "b9a8379e-ee1a-4388-b7ca-7852af1cef08"
version = "0.9.3"
version = "0.10.2"

[[deps.ThreadingUtilities]]
deps = ["ManualMemory"]
Expand Down
1 change: 0 additions & 1 deletion examples/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
StatGeochem = "df4de05a-b714-11e8-3c2a-c30fb13e804c"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Thermochron = "b9a8379e-ee1a-4388-b7ca-7852af1cef08"
3 changes: 1 addition & 2 deletions examples/ZrnHeInversionVartCryst.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
## --- Load required packages

using Thermochron
using StatGeochem, Plots
using Thermochron, Plots

using LinearAlgebra
# Diminishing returns with more than ~4 threads
Expand Down
4 changes: 3 additions & 1 deletion src/Thermochron.jl
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module Thermochron

using Reexport
@reexport using StatGeochemBase

using LinearAlgebra
using VectorizedStatistics
using LoopVectorization
using ProgressMeter: Progress, update!
using StatGeochemBase

include("types.jl")
include("utilities.jl")
Expand Down

2 comments on commit f2a3294

@brenhinkeller
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register
Release notes:

  • Allow separate boundary condition types for temperature and time
  • Move boundary types inside Boundary struct
  • Reexport StatGeochemBase

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/119004

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.10.2 -m "<description of version>" f2a32943cc1b97358027edf9550d45049f1213be
git push origin v0.10.2

Please sign in to comment.