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

Bump rapids libraries, improve MLJ interface #34

Merged
merged 5 commits into from
May 1, 2023
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
13 changes: 7 additions & 6 deletions CondaPkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ channels = ["rapidsai", "nvidia", "conda-forge"]

[deps]
cudatoolkit = ">=11.2,<=11.8"
cudf = "=23.02"
cugraph = "=23.02"
cuml = "=23.02"
cusignal = "=23.02"
cuspatial = "=23.02"
cuxfilter = "=23.02"
cucim = "=23.04"
cudf = "=23.04"
cugraph = "=23.04"
cuml = "=23.04"
cusignal = "=23.04"
cuspatial = "=23.04"
cuxfilter = "=23.04"
python = ">=3.8,<=3.10"
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "RAPIDS"
uuid = "2764e59e-7dd7-4b2d-a28d-ce06411bac13"
authors = ["tylerjthomas9 <tylerjthomas9@gmail.com>"]
version = "0.3.0"
version = "0.3.1"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Expand All @@ -12,7 +12,7 @@ PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

[compat]
CUDA = "3, 4"
CUDA = "3"
CondaPkg = "0.2"
MLJBase = "0.20, 0.21"
MLJModelInterface = "1"
Expand All @@ -22,8 +22,8 @@ julia = "1.8"

[extras]
MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
MLJTestIntegration = "697918b4-fdc1-4f9e-8ff9-929724cee270"
MLJTestInterface = "72560011-54dd-4dc2-94f3-c5de45b75ecd"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "MLJBase", "MLJTestIntegration"]
test = ["Test", "MLJBase", "MLJTestInterface"]
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ The goal of this library is to provide a simple method for accessing the GPU acc

This wrapper could be broken up into several libraries (`cuDF`, `cuML`, `cuGraph`, `cuSignal`, `cuSpatial`), but there would be significant overlap between these libraries. Large dependencies such as `cudatoolkit` would be repeated.

Long term, directly wrapping `libcudf`, `libcuml`... would greatly improve this library, but I don't have time to tackle that at this moment.

# CUDA/GPU requirements
- CUDA 11.0+
- NVIDIA driver 450.80.02+
More information is available [here](https://docs.rapids.ai/install).
- CUDA 11.2+
- NVIDIA driver 460.27.03+
- Pascal architecture or better (Compute Capability >=6.0)
- Ubuntu 20.04/22.04 or CentOS 7 / Rocky Linux 8 with gcc/++ 9.0+

## Installation

Expand Down
24 changes: 11 additions & 13 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
using Documenter
using RAPIDS

DocMeta.setdocmeta!(RAPIDS, :DocTestSetup, :(using RAPIDS); recursive = true)
DocMeta.setdocmeta!(RAPIDS, :DocTestSetup, :(using RAPIDS); recursive=true)

makedocs(;
modules = [RAPIDS],
authors = "tylerjthomas9 <tylerjthomas9@gmail.com>",
repo = "https://github.com/tylerjthomas9/RAPIDS.jl.git",
sitename = "RAPIDS.jl",
format = Documenter.HTML(;
prettyurls = get(ENV, "CI", "false") == "true",
canonical = "https://tylerjthomas9.github.io/RAPIDS.jl",
assets = String[],
modules=[RAPIDS],
authors="tylerjthomas9 <tylerjthomas9@gmail.com>",
repo="https://github.com/tylerjthomas9/RAPIDS.jl.git",
sitename="RAPIDS.jl",
format=Documenter.HTML(;
prettyurls=get(ENV, "CI", "false") == "true",
canonical="https://tylerjthomas9.github.io/RAPIDS.jl",
assets=String[],
),
pages = ["Home" => "index.md",
"Python API" => "python_api.md",
"cuMl" => "cuml.md",],
pages=["Home" => "index.md", "Python API" => "python_api.md", "cuMl" => "cuml.md"],
)

deploydocs(; repo = "github.com/tylerjthomas9/RAPIDS.jl.git")
deploydocs(; repo="github.com/tylerjthomas9/RAPIDS.jl.git")
69 changes: 38 additions & 31 deletions format/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.9.0-DEV"
julia_version = "1.8.5"
manifest_format = "2.0"
project_hash = "30b405be1c677184b7703a9bfb3d2100029ccad0"

Expand All @@ -21,16 +21,16 @@ uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
version = "3.3.6"

[[deps.CommonMark]]
deps = ["Crayons", "JSON", "URIs"]
git-tree-sha1 = "4cd7063c9bdebdbd55ede1af70f3c2f48fab4215"
deps = ["Crayons", "JSON", "SnoopPrecompile", "URIs"]
git-tree-sha1 = "e2f4627b0d3f2c1876360e0b242a7c23923b469d"
uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6"
version = "0.8.6"
version = "0.8.10"

[[deps.Compat]]
deps = ["Dates", "LinearAlgebra", "UUIDs"]
git-tree-sha1 = "3ca828fe1b75fa84b021a7860bd039eaea84d2f2"
git-tree-sha1 = "7a60c856b9fa189eb34f5f8a6f6b5529b7942957"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "4.3.0"
version = "4.6.1"

[[deps.CompilerSupportLibraries_jll]]
deps = ["Artifacts", "Libdl"]
Expand Down Expand Up @@ -61,25 +61,25 @@ version = "1.6.0"
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"

[[deps.Glob]]
git-tree-sha1 = "4df9f7e06108728ebf00a0a11edee4b29a482bb2"
git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496"
uuid = "c27321d9-0574-5035-807b-f59d2c89b15c"
version = "1.3.0"
version = "1.3.1"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[deps.JSON]]
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
version = "0.21.3"
version = "0.21.4"

[[deps.JuliaFormatter]]
deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "Pkg", "Tokenize"]
git-tree-sha1 = "a91af8a988efedba0e80deec6b8ce70a0054e94f"
deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "Pkg", "SnoopPrecompile", "Tokenize"]
git-tree-sha1 = "0f6545dd63fec03d0cfe0c1d28f851e2d804e942"
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
version = "1.0.15"
version = "1.0.25"

[[deps.LibCURL]]
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
Expand All @@ -104,7 +104,7 @@ version = "1.10.2+0"
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[[deps.LinearAlgebra]]
deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
deps = ["Libdl", "libblastrampoline_jll"]
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[[deps.Logging]]
Expand All @@ -124,7 +124,7 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"

[[deps.MozillaCACerts_jll]]
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
version = "2022.10.11"
version = "2022.2.1"

[[deps.NetworkOptions]]
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
Expand All @@ -133,24 +133,30 @@ version = "1.2.0"
[[deps.OpenBLAS_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
version = "0.3.21+0"
version = "0.3.20+0"

[[deps.OrderedCollections]]
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
git-tree-sha1 = "d321bf2de576bf25ec4d3e4360faca399afca282"
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
version = "1.4.1"
version = "1.6.0"

[[deps.Parsers]]
deps = ["Dates", "SnoopPrecompile"]
git-tree-sha1 = "cceb0257b662528ecdf0b4b4302eb00e767b38e7"
git-tree-sha1 = "478ac6c952fddd4399e71d4779797c538d0ff2bf"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "2.5.0"
version = "2.5.8"

[[deps.Pkg]]
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
version = "1.8.0"

[[deps.Preferences]]
deps = ["TOML"]
git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
uuid = "21216c6a-2e73-6563-6e65-726566657250"
version = "1.3.0"

[[deps.Printf]]
deps = ["Unicode"]
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand All @@ -171,9 +177,10 @@ version = "0.7.0"
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[deps.SnoopPrecompile]]
git-tree-sha1 = "f604441450a3c0569830946e5b33b78c928e1a85"
deps = ["Preferences"]
git-tree-sha1 = "e760a70afdcd461cf01a575947738d359234665c"
uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c"
version = "1.0.1"
version = "1.0.3"

[[deps.Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
Expand All @@ -186,17 +193,17 @@ version = "1.0.0"
[[deps.Tar]]
deps = ["ArgTools", "SHA"]
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
version = "1.10.0"
version = "1.10.1"

[[deps.Tokenize]]
git-tree-sha1 = "2b3af135d85d7e70b863540160208fa612e736b9"
git-tree-sha1 = "90538bf898832b6ebd900fa40f223e695970e3a5"
uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
version = "0.5.24"
version = "0.5.25"

[[deps.URIs]]
git-tree-sha1 = "e59ecc5a41b000fa94423a578d29290c7266fc10"
git-tree-sha1 = "074f993b0ca030848b897beff716d93aca60f06a"
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
version = "1.4.0"
version = "1.4.2"

[[deps.UUIDs]]
deps = ["Random", "SHA"]
Expand All @@ -208,12 +215,12 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
[[deps.Zlib_jll]]
deps = ["Libdl"]
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
version = "1.2.13+0"
version = "1.2.12+3"

[[deps.libblastrampoline_jll]]
deps = ["Artifacts", "Libdl"]
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
version = "5.2.0+0"
version = "5.1.1+0"

[[deps.nghttp2_jll]]
deps = ["Artifacts", "Libdl"]
Expand Down
2 changes: 1 addition & 1 deletion format/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Run `julia --project=format format/run.jl` with Julia 1.9 to run JuliaFormatter.
Run `julia --project=format format/run.jl` with Julia 1.8.5 to run JuliaFormatter.

If you update the version of Julia used to generate the Manifest.toml make sure to also update the version in `.github/workflows/format_check.yml` to match.
2 changes: 1 addition & 1 deletion format/run.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using JuliaFormatter

function main()
perfect = format(joinpath(@__DIR__, ".."); verbose = true)
perfect = format(joinpath(@__DIR__, ".."); style=BlueStyle(), verbose=true)
if perfect
@info "Linting complete - no files altered"
else
Expand Down
4 changes: 1 addition & 3 deletions src/CuDF/CuDF.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ using RAPIDS: cudf
using PythonCall
using Tables



end
end
Loading