diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index e60d2f3f..9f37421a 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -151,24 +151,14 @@ jobs: - name: Build workspace run: | docker exec "$CONTAINER_NAME" bash -lc 'set -euo pipefail - cargo build --workspace \ - --exclude "optix*" \ - --exclude "path-tracer" \ - --exclude "denoiser" \ - --exclude "ex0*" \ - --exclude "cudnn*" + cargo build ' - name: Clippy run: | docker exec "$CONTAINER_NAME" bash -lc 'set -euo pipefail export RUSTFLAGS=-Dwarnings - cargo clippy --workspace \ - --exclude "optix*" \ - --exclude "path-tracer" \ - --exclude "denoiser" \ - --exclude "ex0*" \ - --exclude "cudnn*" + cargo clippy ' - name: Check documentation @@ -176,11 +166,6 @@ jobs: docker exec "$CONTAINER_NAME" bash -lc 'set -euo pipefail export RUSTDOCFLAGS=-Dwarnings cargo doc --workspace --all-features --document-private-items --no-deps \ - --exclude "optix*" \ - --exclude "path-tracer" \ - --exclude "denoiser" \ - --exclude "ex0*" \ - --exclude "cudnn*" \ --exclude "cust_raw" ' diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index a5910cf4..15b3a538 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -89,12 +89,12 @@ jobs: run: cargo build --all-features -p cust_raw - name: Build workspace - run: cargo build --workspace --exclude "optix*" --exclude "path-tracer" --exclude "denoiser" --exclude "vecadd*" --exclude "gemm*" --exclude "ex0*" --exclude "cudnn*" --exclude "sha2*" + run: cargo build --workspace --exclude "cudnn*" --exclude "gemm*" --exclude "sha2*" --exclude "vecadd*" - name: Clippy env: RUSTFLAGS: -Dwarnings - run: cargo clippy --workspace --exclude "optix*" --exclude "path-tracer" --exclude "denoiser" --exclude "vecadd*" --exclude "gemm*" --exclude "ex0*" --exclude "cudnn*" --exclude "sha2*" + run: cargo clippy --workspace --exclude "cudnn*" --exclude "gemm*" --exclude "sha2*" --exclude "vecadd*" # Don't currently test because many tests rely on the system having a CUDA GPU # - name: Test @@ -103,7 +103,7 @@ jobs: - name: Check documentation env: RUSTDOCFLAGS: -Dwarnings - run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude "optix*" --exclude "path-tracer" --exclude "denoiser" --exclude "vecadd*" --exclude "gemm*" --exclude "ex0*" --exclude "cudnn*" --exclude "sha2*" --exclude "cust_raw" + run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude "cudnn*" --exclude "cust_raw" --exclude "gemm*" --exclude "sha2*" --exclude "vecadd*" # Disabled due to dll issues, someone with Windows knowledge needed # - name: Compiletest diff --git a/Cargo.lock b/Cargo.lock index 1af88d55..86de864b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli 0.31.1", -] - [[package]] name = "adler2" version = "2.0.1" @@ -35,21 +26,6 @@ dependencies = [ "equator", ] -[[package]] -name = "android_glue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.20" @@ -129,21 +105,9 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.6" @@ -172,17 +136,6 @@ dependencies = [ "cuda_std", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.5.0" @@ -196,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8" dependencies = [ "anyhow", - "arrayvec 0.7.6", + "arrayvec", "log", "nom", "num-rational", @@ -209,30 +162,9 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f" dependencies = [ - "arrayvec 0.7.6", + "arrayvec", ] -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if 1.0.3", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "bimap" version = "0.6.3" @@ -256,7 +188,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.106", + "syn", ] [[package]] @@ -294,12 +226,6 @@ dependencies = [ "num-complex", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.10.4" @@ -347,7 +273,7 @@ checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -356,30 +282,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" -[[package]] -name = "calloop" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" -dependencies = [ - "log", - "nix 0.22.3", -] - -[[package]] -name = "calloop" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" -dependencies = [ - "bitflags 1.3.2", - "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", -] - [[package]] name = "cc" version = "1.2.33" @@ -410,33 +312,12 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "chlorine" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d31b1d19317b4777ec879192d3745bd97d05262b4b19cb1dda284b9d22f19" - [[package]] name = "clang-sys" version = "1.8.1" @@ -445,22 +326,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.8", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width 0.1.14", - "vec_map", + "libloading", ] [[package]] @@ -482,7 +348,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -491,10 +357,10 @@ version = "4.5.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -503,61 +369,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" -[[package]] -name = "cmake" -version = "0.1.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types", - "libc", - "objc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -596,9 +407,10 @@ dependencies = [ name = "compiletests" version = "0.1.0" dependencies = [ - "clap 4.5.45", + "clap", "compiletest_rs", "cuda_builder", + "rustc_codegen_nvvm", "tracing", "tracing-subscriber", ] @@ -610,112 +422,6 @@ dependencies = [ "cuda_std", ] -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys 0.8.7", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.7.0", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - -[[package]] -name = "core-text" -version = "20.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" -dependencies = [ - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - [[package]] name = "cpufeatures" version = "0.2.17" @@ -731,7 +437,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", ] [[package]] @@ -759,29 +465,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crossfont" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb5a3822b594afc99b503cc1859b94686d3c3efdd60507a28587dab80ee1071" -dependencies = [ - "cocoa 0.25.0", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", - "core-graphics 0.23.2", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - [[package]] name = "crunchy" version = "0.2.4" @@ -798,12 +481,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "cuda_builder" version = "0.3.0" @@ -832,7 +509,7 @@ version = "0.2.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -917,7 +594,7 @@ version = "0.2.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -930,61 +607,6 @@ dependencies = [ "doxygen-bindgen", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "denoiser" -version = "0.1.0" -dependencies = [ - "cust", - "glam", - "image", - "optix", - "structopt", -] - -[[package]] -name = "device" -version = "0.1.0" -dependencies = [ - "cuda_std", - "cust_core", - "optix_device", -] - [[package]] name = "diff" version = "0.1.13" @@ -1007,7 +629,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "dirs-sys-next", ] @@ -1022,27 +644,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.8", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - [[package]] name = "doxygen-bindgen" version = "0.1.3" @@ -1052,20 +653,6 @@ dependencies = [ "yap", ] -[[package]] -name = "dwrote" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe1f192fcce01590bd8d839aca53ce0d11d803bf291b2a6c4ad925a8f0024be" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "either" version = "1.15.0" @@ -1073,36 +660,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] -name = "embed-doc-image" -version = "0.1.4" +name = "equator" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" +checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" dependencies = [ - "base64", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "equator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" -dependencies = [ - "equator-macro", + "equator-macro", ] [[package]] @@ -1113,7 +676,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1132,64 +695,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "ex02_pipeline" -version = "0.1.0" -dependencies = [ - "anyhow", - "cuda_builder", - "cust", - "device", - "optix", - "optix-sys", -] - -[[package]] -name = "ex03_window" -version = "0.1.0" -dependencies = [ - "anyhow", - "cust", - "gl", - "glam", - "glfw", - "num-traits", - "optix", - "optix-sys", -] - -[[package]] -name = "ex04_mesh" -version = "0.1.0" -dependencies = [ - "anyhow", - "cuda_builder", - "cust", - "gl", - "glam", - "glfw", - "num-traits", - "optix", -] - -[[package]] -name = "ex04_mesh_gpu" -version = "0.1.0" -dependencies = [ - "cuda_std", - "optix_device", -] - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exr" version = "1.73.0" @@ -1226,7 +731,7 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "libc", "libredox", "windows-sys 0.59.0", @@ -1242,76 +747,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - [[package]] name = "gemm" version = "0.1.0" @@ -1350,7 +785,7 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1" dependencies = [ - "unicode-width 0.2.1", + "unicode-width", ] [[package]] @@ -1359,7 +794,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "libc", "wasi 0.11.1+wasi-snapshot-preview1", ] @@ -1370,7 +805,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", @@ -1397,32 +832,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "gl" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - [[package]] name = "glam" version = "0.30.5" @@ -1431,46 +840,6 @@ checksum = "f2d1aab06663bdce00d6ca5e5ed586ec8d18033a771906c993a1e3755b368d85" dependencies = [ "bytemuck", "libm", - "mint", -] - -[[package]] -name = "glfw" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a3f9afbfd6576fca75be1e5cfc6db259b3a9b65844d34890b0711e82953605" -dependencies = [ - "bitflags 1.3.2", - "glfw-sys", - "objc", - "raw-window-handle 0.3.4", - "semver 0.9.0", - "winapi", -] - -[[package]] -name = "glfw-sys" -version = "3.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0cbb12e2dfac494316e91f6bf7cf070ccd9c61501a02f4af14d71222c9f67f" -dependencies = [ - "cmake", -] - -[[package]] -name = "glium" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf" -dependencies = [ - "backtrace", - "fnv", - "gl_generator", - "glutin 0.29.1", - "lazy_static", - "memoffset 0.6.5", - "smallvec", - "takeable-option", ] [[package]] @@ -1479,104 +848,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" -[[package]] -name = "glutin" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ea9dbe544bc8a657c4c4a798c2d16cd01b549820e47657297549d28371f6d2" -dependencies = [ - "android_glue", - "cgl", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "glutin_egl_sys", - "glutin_emscripten_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "lazy_static", - "libloading 0.7.4", - "log", - "objc", - "osmesa-sys", - "parking_lot 0.11.2", - "wayland-client", - "wayland-egl", - "winapi", - "winit 0.26.1", -] - -[[package]] -name = "glutin" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713" -dependencies = [ - "cgl", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "glutin_egl_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "libloading 0.7.4", - "log", - "objc", - "once_cell", - "osmesa-sys", - "parking_lot 0.12.4", - "raw-window-handle 0.5.2", - "wayland-client", - "wayland-egl", - "winapi", - "winit 0.27.5", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d" -dependencies = [ - "gl_generator", - "winapi", -] - -[[package]] -name = "glutin_emscripten_sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1" - -[[package]] -name = "glutin_gles2_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103" -dependencies = [ - "gl_generator", - "objc", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" -dependencies = [ - "gl_generator", -] - [[package]] name = "gpu_rand" version = "0.1.3" @@ -1592,7 +863,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "crunchy", ] @@ -1602,42 +873,18 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "image" version = "0.25.6" @@ -1677,51 +924,6 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" -[[package]] -name = "imgui" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fed69cf982eee638cb1a2f1cf1d4b20626ea1813b7d37df6f7d3a2d5086c8cc" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.3", - "imgui-sys", - "mint", - "parking_lot 0.12.4", -] - -[[package]] -name = "imgui-glium-renderer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268e540dd36ef37d640cb8d6e66a87af160f61745b8f8ee518109cade69d64fc" -dependencies = [ - "glium", - "imgui", -] - -[[package]] -name = "imgui-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efc4bf8f1638a573e262ce131f870226d172e986fe966a141c2c60602589b71" -dependencies = [ - "cc", - "cfg-if 1.0.3", - "chlorine", - "mint", -] - -[[package]] -name = "imgui-winit-support" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f1fe7b8e1e042fadb8e521fe813c0311fdd0de27274bd37ef78eb8ba248161" -dependencies = [ - "imgui", - "winit 0.27.5", -] - [[package]] name = "indexmap" version = "2.10.0" @@ -1732,18 +934,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if 1.0.3", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "interpolate_name" version = "0.2.4" @@ -1752,7 +942,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1794,12 +984,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "jobserver" version = "0.1.33" @@ -1816,22 +1000,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - [[package]] name = "lazy_static" version = "1.5.0" @@ -1860,23 +1028,13 @@ dependencies = [ "cc", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.3", - "winapi", -] - [[package]] name = "libloading" version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "windows-targets 0.53.3", ] @@ -1894,7 +1052,7 @@ checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" dependencies = [ "bitflags 2.9.2", "libc", - "redox_syscall 0.5.17", + "redox_syscall", ] [[package]] @@ -1915,16 +1073,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" -[[package]] -name = "lock_api" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.27" @@ -1951,15 +1099,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - [[package]] name = "matchers" version = "0.1.0" @@ -1985,7 +1124,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "rayon", ] @@ -1995,42 +1134,6 @@ version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" -[[package]] -name = "memmap2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2053,18 +1156,6 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - [[package]] name = "miow" version = "0.6.0" @@ -2097,151 +1188,21 @@ dependencies = [ ] [[package]] -name = "ndarray-rand" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f093b3db6fd194718dcdeea6bd8c829417deae904e3fcc7732dabcd4416d25d8" -dependencies = [ - "ndarray", - "rand 0.8.5", - "rand_distr", -] - -[[package]] -name = "ndk" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.2.2", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.5.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.2.2", -] - -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk 0.7.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.4.1+23.1.7779620", - "once_cell", - "parking_lot 0.12.4", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.3", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.24.3" +name = "ndarray-rand" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f093b3db6fd194718dcdeea6bd8c829417deae904e3fcc7732dabcd4416d25d8" dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.3", - "libc", - "memoffset 0.6.5", + "ndarray", + "rand 0.8.5", + "rand_distr", ] [[package]] -name = "nix" -version = "0.25.1" +name = "new_debug_unreachable" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if 1.0.3", - "libc", - "memoffset 0.6.5", -] +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -2259,15 +1220,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2305,7 +1257,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2344,31 +1296,10 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ - "hermit-abi 0.5.2", + "hermit-abi", "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "nvvm" version = "0.1.1" @@ -2377,15 +1308,6 @@ dependencies = [ "strum 0.27.2", ] -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - [[package]] name = "object" version = "0.36.7" @@ -2427,161 +1349,18 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "optix" -version = "0.1.0" -dependencies = [ - "bitflags 2.9.2", - "cfg-if 1.0.3", - "cust", - "cust_raw", - "embed-doc-image", - "glam", - "half", - "memoffset 0.9.1", - "mint", - "optix-sys", -] - -[[package]] -name = "optix-sys" -version = "0.1.0" -dependencies = [ - "bindgen", - "cc", - "cust_raw", -] - -[[package]] -name = "optix_device" -version = "0.1.0" -dependencies = [ - "bitflags 2.9.2", - "cuda_std", - "cust_core", - "paste", - "seq-macro", -] - -[[package]] -name = "optix_device_macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "osmesa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -dependencies = [ - "shared_library", -] - [[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.11", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.3", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" -dependencies = [ - "cfg-if 1.0.3", - "libc", - "redox_syscall 0.5.17", - "smallvec", - "windows-targets 0.52.6", -] - [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "path-tracer" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytemuck", - "cuda_builder", - "cust", - "glam", - "glium", - "glutin 0.28.0", - "gpu_rand", - "image", - "imgui", - "imgui-glium-renderer", - "imgui-winit-support", - "optix", - "path-tracer-kernels", - "rayon", - "sysinfo", -] - -[[package]] -name = "path-tracer-kernels" -version = "0.1.0" -dependencies = [ - "approx", - "cuda_std", - "cust_core", - "enum_dispatch", - "glam", - "gpu_rand", - "optix_device", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pico-args" version = "0.4.2" @@ -2644,41 +1423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.106", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "syn", ] [[package]] @@ -2706,7 +1451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2832,11 +1577,11 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.6", + "arrayvec", "av1-grain", "bitstream-io", "built", - "cfg-if 1.0.3", + "cfg-if", "interpolate_name", "itertools 0.12.1", "libc", @@ -2874,31 +1619,6 @@ dependencies = [ "rgb", ] -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "rawpointer" version = "0.2.1" @@ -2925,15 +1645,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.17" @@ -3024,10 +1735,10 @@ dependencies = [ "build-helper", "cc", "curl", - "gimli 0.30.0", + "gimli", "itertools 0.14.0", "libc", - "libloading 0.8.8", + "libloading", "nvvm", "object", "rustc-demangle", @@ -3045,7 +1756,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -3103,15 +1814,6 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "schannel" version = "0.1.27" @@ -3121,30 +1823,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sctk-adwaita" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" -dependencies = [ - "crossfont", - "log", - "smithay-client-toolkit 0.16.1", - "tiny-skia", -] - [[package]] name = "semver" version = "0.6.0" @@ -3154,15 +1832,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.26" @@ -3175,12 +1844,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "seq-macro" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" - [[package]] name = "serde" version = "1.0.219" @@ -3198,7 +1861,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -3222,34 +1885,13 @@ dependencies = [ "serde", ] -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - [[package]] name = "sha2" version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "cpufeatures", "digest", ] @@ -3281,16 +1923,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - [[package]] name = "shlex" version = "1.3.0" @@ -3305,65 +1937,18 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "smithay-client-toolkit" -version = "0.15.4" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" dependencies = [ - "bitflags 1.3.2", - "calloop 0.9.3", - "dlib", - "lazy_static", - "log", - "memmap2 0.3.1", - "nix 0.22.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "quote", ] [[package]] -name = "smithay-client-toolkit" -version = "0.16.1" +name = "smallvec" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" -dependencies = [ - "bitflags 1.3.2", - "calloop 0.10.6", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" @@ -3387,48 +1972,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "strum" version = "0.26.3" @@ -3453,11 +2002,11 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.106", + "syn", ] [[package]] @@ -3466,21 +2015,10 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ + "heck", "proc-macro2", "quote", - "unicode-ident", + "syn", ] [[package]] @@ -3494,20 +2032,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sysinfo" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" -dependencies = [ - "core-foundation-sys 0.8.7", - "libc", - "memchr", - "ntapi", - "rayon", - "windows", -] - [[package]] name = "system-deps" version = "6.2.2" @@ -3515,18 +2039,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", "pkg-config", "toml", "version-compare", ] -[[package]] -name = "takeable-option" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ae8932fcfea38b7d3883ae2ab357b0d57a02caaa18ebb4f5ece08beaec4aa0" - [[package]] name = "tar" version = "0.4.44" @@ -3561,22 +2079,13 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "getopts", "libc", "num_cpus", "term", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width 0.1.14", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -3594,7 +2103,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -3603,7 +2112,7 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", ] [[package]] @@ -3617,31 +2126,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "tiny-skia" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if 1.0.3", - "png", - "safe_arch", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" -dependencies = [ - "arrayref", - "bytemuck", -] - [[package]] name = "toml" version = "0.8.23" @@ -3651,7 +2135,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.27", + "toml_edit", ] [[package]] @@ -3663,17 +2147,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.27" @@ -3684,7 +2157,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.12", + "winnow", ] [[package]] @@ -3706,7 +2179,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -3754,7 +2227,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "static_assertions", ] @@ -3770,18 +2243,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - [[package]] name = "unicode-width" version = "0.2.1" @@ -3817,12 +2278,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "vecadd" version = "0.1.0" @@ -3884,7 +2339,7 @@ version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ - "cfg-if 1.0.3", + "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -3900,7 +2355,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-shared", ] @@ -3922,7 +2377,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3936,99 +2391,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-egl" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d" -dependencies = [ - "wayland-client", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "weezl" version = "0.1.10" @@ -4057,78 +2419,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "windows-link" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -4222,12 +2518,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4246,12 +2536,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -4282,12 +2566,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -4306,12 +2584,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -4348,12 +2620,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4372,81 +2638,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" -[[package]] -name = "winit" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" -dependencies = [ - "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "ndk 0.5.0", - "ndk-glue 0.5.2", - "ndk-sys 0.2.2", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.4.3", - "smithay-client-toolkit 0.15.4", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "winapi", - "x11-dl", -] - -[[package]] -name = "winit" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" -dependencies = [ - "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "dispatch", - "instant", - "libc", - "log", - "mio", - "ndk 0.7.0", - "ndk-glue 0.7.0", - "objc", - "once_cell", - "parking_lot 0.12.4", - "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", - "sctk-adwaita", - "smithay-client-toolkit 0.16.1", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "windows-sys 0.36.1", - "x11-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.7.12" @@ -4456,15 +2647,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - [[package]] name = "wit-bindgen-rt" version = "0.39.0" @@ -4474,17 +2656,6 @@ dependencies = [ "bitflags 2.9.2", ] -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - [[package]] name = "xattr" version = "1.5.1" @@ -4495,18 +2666,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "xcursor" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" - -[[package]] -name = "xml-rs" -version = "0.8.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7" - [[package]] name = "xtask" version = "0.0.0" @@ -4557,7 +2716,7 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 715e6e96..29f33d7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,32 +1,52 @@ [workspace] resolver = "2" members = [ - "crates/*", - "crates/optix/examples/ex*", - "crates/optix/examples/ex*/device", - "crates/optix/examples/rust/ex*", + "crates/blastoff", + "crates/cuda_builder", + "crates/cuda_std", + "crates/cuda_std_macros", + "crates/cudnn", + "crates/cudnn-sys", + "crates/cust", + "crates/cust_core", + "crates/cust_derive", + "crates/cust_raw", + "crates/gpu_rand", + "crates/nvvm", + "crates/ptx", + "crates/ptx_compiler", + "crates/rustc_codegen_nvvm", + "crates/rustc_codegen_nvvm_macros", - "xtask", + # These crates that rely on OptiX are disabled because OptiX is less important than CUDA and the + # OptiX SDK is a pain to install. + # "crates/optix", + # "crates/optix_device", + # "crates/optix_device_macros", + # "crates/optix-sys", + # "crates/optix/examples/denoiser", + # "crates/optix/examples/ex02_pipeline", + # "crates/optix/examples/ex02_pipeline/kernels", + # "crates/optix/examples/ex03_window", + # "crates/optix/examples/ex04_mesh", + # "crates/optix/examples/ex04_mesh/kernels", + # "crates/optix/examples/path_tracer", + # "crates/optix/examples/path_tracer/kernels", - "examples/cuda/vecadd", - "examples/cuda/vecadd/kernels", - "examples/cuda/gemm", - "examples/cuda/gemm/kernels", - "examples/cuda/path_tracer", - "examples/cuda/path_tracer/kernels", - "examples/cuda/sha2_crates_io", - "examples/cuda/sha2_crates_io/kernels", - - "examples/optix/*", - "tests/compiletests", - "tests/compiletests/deps-helper", + "examples/gemm", + "examples/gemm/kernels", + "examples/sha2_crates_io", + "examples/sha2_crates_io/kernels", + "examples/vecadd", + "examples/vecadd/kernels", "samples/introduction/async_api", "samples/introduction/async_api/kernels", -] -exclude = [ - "crates/optix/examples/common", + "tests/compiletests", + "tests/compiletests/deps-helper", + + "xtask", ] [profile.dev.package.rustc_codegen_nvvm] diff --git a/examples/optix/denoiser/Cargo.toml b/crates/optix/examples/denoiser/Cargo.toml similarity index 51% rename from examples/optix/denoiser/Cargo.toml rename to crates/optix/examples/denoiser/Cargo.toml index 92eb5177..b5c711d9 100644 --- a/examples/optix/denoiser/Cargo.toml +++ b/crates/optix/examples/denoiser/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -optix = { version = "0.1", path = "../../../crates/optix" } +optix = { version = "0.1", path = "../../" } structopt = "0.3" -cust = { version = "0.3", path = "../../../crates/cust", features = ["impl_glam", "bytemuck"] } +cust = { version = "0.3", path = "../../../cust", features = ["impl_glam", "bytemuck"] } image = "0.25.5" glam = { version = "0.30", features = ["bytemuck"] } diff --git a/examples/optix/denoiser/README.md b/crates/optix/examples/denoiser/README.md similarity index 100% rename from examples/optix/denoiser/README.md rename to crates/optix/examples/denoiser/README.md diff --git a/examples/optix/denoiser/noisy.png b/crates/optix/examples/denoiser/noisy.png similarity index 100% rename from examples/optix/denoiser/noisy.png rename to crates/optix/examples/denoiser/noisy.png diff --git a/examples/optix/denoiser/src/main.rs b/crates/optix/examples/denoiser/src/main.rs similarity index 100% rename from examples/optix/denoiser/src/main.rs rename to crates/optix/examples/denoiser/src/main.rs diff --git a/crates/optix/examples/ex02_pipeline/Cargo.toml b/crates/optix/examples/ex02_pipeline/Cargo.toml index ff0ad4e0..5aeb7fc0 100644 --- a/crates/optix/examples/ex02_pipeline/Cargo.toml +++ b/crates/optix/examples/ex02_pipeline/Cargo.toml @@ -10,7 +10,7 @@ optix = { path = "../../" } optix-sys = { path = "../../../optix-sys" } cust = { path = "../../../cust" } anyhow = "1.0.44" -device = { path = "./device" } +ex02_pipeline-kernels = { path = "./kernels" } [build-dependencies] cuda_builder = { workspace = true, default-features = false } diff --git a/crates/optix/examples/ex02_pipeline/build.rs b/crates/optix/examples/ex02_pipeline/build.rs index 4eb0f5b1..91623e46 100644 --- a/crates/optix/examples/ex02_pipeline/build.rs +++ b/crates/optix/examples/ex02_pipeline/build.rs @@ -18,9 +18,9 @@ fn main() { .collect::>(); compile_to_ptx("src/ex02_pipeline.cu", &args); - let ptx_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("device.ptx"); + let ptx_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("kernels.ptx"); - CudaBuilder::new("device") + CudaBuilder::new("kernels") .copy_to(ptx_path) .arch(cuda_builder::NvvmArch::Compute75) .optix(true) diff --git a/crates/optix/examples/ex02_pipeline/device/Cargo.toml b/crates/optix/examples/ex02_pipeline/kernels/Cargo.toml similarity index 92% rename from crates/optix/examples/ex02_pipeline/device/Cargo.toml rename to crates/optix/examples/ex02_pipeline/kernels/Cargo.toml index 0b3dfa59..5da6d319 100644 --- a/crates/optix/examples/ex02_pipeline/device/Cargo.toml +++ b/crates/optix/examples/ex02_pipeline/kernels/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "device" +name = "ex02_pipeline-kernels" version = "0.1.0" edition = "2021" diff --git a/crates/optix/examples/ex02_pipeline/device/src/lib.rs b/crates/optix/examples/ex02_pipeline/kernels/src/lib.rs similarity index 100% rename from crates/optix/examples/ex02_pipeline/device/src/lib.rs rename to crates/optix/examples/ex02_pipeline/kernels/src/lib.rs diff --git a/crates/optix/examples/ex02_pipeline/src/renderer.rs b/crates/optix/examples/ex02_pipeline/src/renderer.rs index ddc5d530..77d70e61 100644 --- a/crates/optix/examples/ex02_pipeline/src/renderer.rs +++ b/crates/optix/examples/ex02_pipeline/src/renderer.rs @@ -28,7 +28,7 @@ pub struct Renderer { cuda_context: CuContext, } -use device::LaunchParams; +use kernels::LaunchParams; impl Renderer { pub fn new(width: usize, height: usize) -> Result> { @@ -62,7 +62,7 @@ impl Renderer { .exception_flags(ExceptionFlags::NONE); // let ptx = include_str!(concat!(env!("OUT_DIR"), "/src/ex02_pipeline.ptx")); - let ptx = include_str!(concat!(env!("OUT_DIR"), "/device.ptx")); + let ptx = include_str!(concat!(env!("OUT_DIR"), "/kernels.ptx")); let (module, _log) = Module::new( &mut ctx, diff --git a/crates/optix/examples/ex04_mesh/build.rs b/crates/optix/examples/ex04_mesh/build.rs index 1e3e99d4..b9a5da1c 100644 --- a/crates/optix/examples/ex04_mesh/build.rs +++ b/crates/optix/examples/ex04_mesh/build.rs @@ -1,8 +1,12 @@ +use std::env; +use std::path; + use cuda_builder::CudaBuilder; fn main() { - CudaBuilder::new("../rust/ex04_mesh_gpu") - .copy_to("../resources/ex04_mesh.ptx") + let ptx_path = path::PathBuf::from(env::var("OUT_DIR").unwrap()).join("kernels.ptx"); + CudaBuilder::new("kernels") + .copy_to(ptx_path) .build() .unwrap(); } diff --git a/crates/optix/examples/rust/ex04_mesh_gpu/Cargo.toml b/crates/optix/examples/ex04_mesh/kernels/Cargo.toml similarity index 89% rename from crates/optix/examples/rust/ex04_mesh_gpu/Cargo.toml rename to crates/optix/examples/ex04_mesh/kernels/Cargo.toml index 948ae577..a4ffd934 100644 --- a/crates/optix/examples/rust/ex04_mesh_gpu/Cargo.toml +++ b/crates/optix/examples/ex04_mesh/kernels/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ex04_mesh_gpu" +name = "ex04_mesh-kernels" version = "0.1.0" edition = "2021" diff --git a/crates/optix/examples/rust/ex04_mesh_gpu/src/lib.rs b/crates/optix/examples/ex04_mesh/kernels/src/lib.rs similarity index 100% rename from crates/optix/examples/rust/ex04_mesh_gpu/src/lib.rs rename to crates/optix/examples/ex04_mesh/kernels/src/lib.rs diff --git a/examples/cuda/path_tracer/Cargo.toml b/crates/optix/examples/path_tracer/Cargo.toml similarity index 70% rename from examples/cuda/path_tracer/Cargo.toml rename to crates/optix/examples/path_tracer/Cargo.toml index 6b6a461e..4b1bf7aa 100644 --- a/examples/cuda/path_tracer/Cargo.toml +++ b/crates/optix/examples/path_tracer/Cargo.toml @@ -6,13 +6,11 @@ edition = "2018" [dependencies] glam = { version = "0.30", features = ["bytemuck", "cuda", "mint"] } bytemuck = { version = "1.21", features = ["derive"] } -cust = { version = "0.3", path = "../../../crates/cust", features = [ - "impl_glam", -] } +cust = { version = "0.3", path = "../../../cust", features = ["impl_glam"] } image = "0.25.5" path-tracer-kernels = { path = "kernels" } -gpu_rand = { version = "0.1", path = "../../../crates/gpu_rand" } -optix = { version = "0.1", path = "../../../crates/optix" } +gpu_rand = { version = "0.1", path = "../../../gpu_rand" } +optix = { version = "0.1", path = "../../../optix" } glium = "0.32.0" glutin = "0.28.0" imgui = "0.9.0" diff --git a/examples/cuda/path_tracer/build.rs b/crates/optix/examples/path_tracer/build.rs similarity index 100% rename from examples/cuda/path_tracer/build.rs rename to crates/optix/examples/path_tracer/build.rs diff --git a/examples/cuda/path_tracer/kernels/Cargo.toml b/crates/optix/examples/path_tracer/kernels/Cargo.toml similarity index 51% rename from examples/cuda/path_tracer/kernels/Cargo.toml rename to crates/optix/examples/path_tracer/kernels/Cargo.toml index d22b0ace..1f3c34ea 100644 --- a/examples/cuda/path_tracer/kernels/Cargo.toml +++ b/crates/optix/examples/path_tracer/kernels/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2018" [dependencies] -cuda_std = { version = "0.2", path = "../../../../crates/cuda_std" } +cuda_std = { version = "0.2", path = "../../../../cuda_std" } glam = { version = "0.30", default-features = false, features = ["libm", "cuda"] } enum_dispatch = "0.3.13" -gpu_rand = { version = "0.1", path = "../../../../crates/gpu_rand" } -cust_core = { path = "../../../../crates/cust_core", features=["glam"] } -optix_device = { path = "../../../../crates/optix_device" } +gpu_rand = { version = "0.1", path = "../../../../gpu_rand" } +cust_core = { path = "../../../../cust_core", features = ["glam"] } +optix_device = { path = "../../../../optix_device" } approx = { version = "0.5" } [lib] diff --git a/examples/cuda/path_tracer/kernels/src/hittable.rs b/crates/optix/examples/path_tracer/kernels/src/hittable.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/hittable.rs rename to crates/optix/examples/path_tracer/kernels/src/hittable.rs diff --git a/examples/cuda/path_tracer/kernels/src/lib.rs b/crates/optix/examples/path_tracer/kernels/src/lib.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/lib.rs rename to crates/optix/examples/path_tracer/kernels/src/lib.rs diff --git a/examples/cuda/path_tracer/kernels/src/material.rs b/crates/optix/examples/path_tracer/kernels/src/material.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/material.rs rename to crates/optix/examples/path_tracer/kernels/src/material.rs diff --git a/examples/cuda/path_tracer/kernels/src/math.rs b/crates/optix/examples/path_tracer/kernels/src/math.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/math.rs rename to crates/optix/examples/path_tracer/kernels/src/math.rs diff --git a/examples/cuda/path_tracer/kernels/src/optix.rs b/crates/optix/examples/path_tracer/kernels/src/optix.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/optix.rs rename to crates/optix/examples/path_tracer/kernels/src/optix.rs diff --git a/examples/cuda/path_tracer/kernels/src/render.rs b/crates/optix/examples/path_tracer/kernels/src/render.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/render.rs rename to crates/optix/examples/path_tracer/kernels/src/render.rs diff --git a/examples/cuda/path_tracer/kernels/src/render_kernels.rs b/crates/optix/examples/path_tracer/kernels/src/render_kernels.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/render_kernels.rs rename to crates/optix/examples/path_tracer/kernels/src/render_kernels.rs diff --git a/examples/cuda/path_tracer/kernels/src/scene.rs b/crates/optix/examples/path_tracer/kernels/src/scene.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/scene.rs rename to crates/optix/examples/path_tracer/kernels/src/scene.rs diff --git a/examples/cuda/path_tracer/kernels/src/sphere.rs b/crates/optix/examples/path_tracer/kernels/src/sphere.rs similarity index 100% rename from examples/cuda/path_tracer/kernels/src/sphere.rs rename to crates/optix/examples/path_tracer/kernels/src/sphere.rs diff --git a/examples/cuda/path_tracer/shaders/image.frag b/crates/optix/examples/path_tracer/shaders/image.frag similarity index 100% rename from examples/cuda/path_tracer/shaders/image.frag rename to crates/optix/examples/path_tracer/shaders/image.frag diff --git a/examples/cuda/path_tracer/shaders/image.vert b/crates/optix/examples/path_tracer/shaders/image.vert similarity index 100% rename from examples/cuda/path_tracer/shaders/image.vert rename to crates/optix/examples/path_tracer/shaders/image.vert diff --git a/examples/cuda/path_tracer/src/common.rs b/crates/optix/examples/path_tracer/src/common.rs similarity index 100% rename from examples/cuda/path_tracer/src/common.rs rename to crates/optix/examples/path_tracer/src/common.rs diff --git a/examples/cuda/path_tracer/src/cpu/mod.rs b/crates/optix/examples/path_tracer/src/cpu/mod.rs similarity index 100% rename from examples/cuda/path_tracer/src/cpu/mod.rs rename to crates/optix/examples/path_tracer/src/cpu/mod.rs diff --git a/examples/cuda/path_tracer/src/cuda/data.rs b/crates/optix/examples/path_tracer/src/cuda/data.rs similarity index 100% rename from examples/cuda/path_tracer/src/cuda/data.rs rename to crates/optix/examples/path_tracer/src/cuda/data.rs diff --git a/examples/cuda/path_tracer/src/cuda/mod.rs b/crates/optix/examples/path_tracer/src/cuda/mod.rs similarity index 100% rename from examples/cuda/path_tracer/src/cuda/mod.rs rename to crates/optix/examples/path_tracer/src/cuda/mod.rs diff --git a/examples/cuda/path_tracer/src/main.rs b/crates/optix/examples/path_tracer/src/main.rs similarity index 100% rename from examples/cuda/path_tracer/src/main.rs rename to crates/optix/examples/path_tracer/src/main.rs diff --git a/examples/cuda/path_tracer/src/optix/mod.rs b/crates/optix/examples/path_tracer/src/optix/mod.rs similarity index 100% rename from examples/cuda/path_tracer/src/optix/mod.rs rename to crates/optix/examples/path_tracer/src/optix/mod.rs diff --git a/examples/cuda/path_tracer/src/renderer.rs b/crates/optix/examples/path_tracer/src/renderer.rs similarity index 100% rename from examples/cuda/path_tracer/src/renderer.rs rename to crates/optix/examples/path_tracer/src/renderer.rs diff --git a/examples/cuda/path_tracer/src/viewer.rs b/crates/optix/examples/path_tracer/src/viewer.rs similarity index 100% rename from examples/cuda/path_tracer/src/viewer.rs rename to crates/optix/examples/path_tracer/src/viewer.rs diff --git a/examples/cuda/README.md b/examples/README.md similarity index 100% rename from examples/cuda/README.md rename to examples/README.md diff --git a/examples/cuda/assets/path_tracer.png b/examples/assets/path_tracer.png similarity index 100% rename from examples/cuda/assets/path_tracer.png rename to examples/assets/path_tracer.png diff --git a/examples/cuda/gemm/Cargo.toml b/examples/gemm/Cargo.toml similarity index 54% rename from examples/cuda/gemm/Cargo.toml rename to examples/gemm/Cargo.toml index 8f6645ee..baac9da8 100644 --- a/examples/cuda/gemm/Cargo.toml +++ b/examples/gemm/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2024" [dependencies] -blastoff = { path = "../../../crates/blastoff" } -cuda_std = { path = "../../../crates/cuda_std" } -cust = { path = "../../../crates/cust" } -cust_raw = { path = "../../../crates/cust_raw", features = ["driver"] } +blastoff = { path = "../../crates/blastoff" } +cuda_std = { path = "../../crates/cuda_std" } +cust = { path = "../../crates/cust" } +cust_raw = { path = "../../crates/cust_raw", features = ["driver"] } ndarray = { version = "0.16", features = ["approx"] } ndarray-rand = "0.15.0" rand = "0.9" diff --git a/examples/cuda/gemm/build.rs b/examples/gemm/build.rs similarity index 100% rename from examples/cuda/gemm/build.rs rename to examples/gemm/build.rs diff --git a/examples/cuda/gemm/kernels/Cargo.toml b/examples/gemm/kernels/Cargo.toml similarity index 80% rename from examples/cuda/gemm/kernels/Cargo.toml rename to examples/gemm/kernels/Cargo.toml index b92683ea..e8e1e7bd 100644 --- a/examples/cuda/gemm/kernels/Cargo.toml +++ b/examples/gemm/kernels/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -cuda_std = { path = "../../../../crates/cuda_std" } +cuda_std = { path = "../../../crates/cuda_std" } glam = { version = "0.30.1", default-features = false, features = ["cuda", "nostd-libm"] } [lib] diff --git a/examples/cuda/gemm/kernels/src/gemm_naive.rs b/examples/gemm/kernels/src/gemm_naive.rs similarity index 100% rename from examples/cuda/gemm/kernels/src/gemm_naive.rs rename to examples/gemm/kernels/src/gemm_naive.rs diff --git a/examples/cuda/gemm/kernels/src/gemm_tiled.rs b/examples/gemm/kernels/src/gemm_tiled.rs similarity index 100% rename from examples/cuda/gemm/kernels/src/gemm_tiled.rs rename to examples/gemm/kernels/src/gemm_tiled.rs diff --git a/examples/cuda/gemm/kernels/src/lib.rs b/examples/gemm/kernels/src/lib.rs similarity index 100% rename from examples/cuda/gemm/kernels/src/lib.rs rename to examples/gemm/kernels/src/lib.rs diff --git a/examples/cuda/gemm/src/main.rs b/examples/gemm/src/main.rs similarity index 100% rename from examples/cuda/gemm/src/main.rs rename to examples/gemm/src/main.rs diff --git a/examples/cuda/sha2_crates_io/Cargo.toml b/examples/sha2_crates_io/Cargo.toml similarity index 84% rename from examples/cuda/sha2_crates_io/Cargo.toml rename to examples/sha2_crates_io/Cargo.toml index ad6fa0b5..49248d58 100644 --- a/examples/cuda/sha2_crates_io/Cargo.toml +++ b/examples/sha2_crates_io/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -cust = { path = "../../../crates/cust" } +cust = { path = "../../crates/cust" } sha2_crates_io_kernels = { path = "kernels" } sha2 = "0.10" diff --git a/examples/cuda/sha2_crates_io/build.rs b/examples/sha2_crates_io/build.rs similarity index 100% rename from examples/cuda/sha2_crates_io/build.rs rename to examples/sha2_crates_io/build.rs diff --git a/examples/cuda/sha2_crates_io/kernels/Cargo.toml b/examples/sha2_crates_io/kernels/Cargo.toml similarity index 64% rename from examples/cuda/sha2_crates_io/kernels/Cargo.toml rename to examples/sha2_crates_io/kernels/Cargo.toml index d06bd88d..79077529 100644 --- a/examples/cuda/sha2_crates_io/kernels/Cargo.toml +++ b/examples/sha2_crates_io/kernels/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2024" [dependencies] -cuda_std = { path = "../../../../crates/cuda_std" } +cuda_std = { path = "../../../crates/cuda_std" } sha2 = { version = "0.10", default-features = false } [lib] -crate-type = ["cdylib", "rlib"] \ No newline at end of file +crate-type = ["cdylib", "rlib"] diff --git a/examples/cuda/sha2_crates_io/kernels/src/lib.rs b/examples/sha2_crates_io/kernels/src/lib.rs similarity index 100% rename from examples/cuda/sha2_crates_io/kernels/src/lib.rs rename to examples/sha2_crates_io/kernels/src/lib.rs diff --git a/examples/cuda/sha2_crates_io/src/main.rs b/examples/sha2_crates_io/src/main.rs similarity index 100% rename from examples/cuda/sha2_crates_io/src/main.rs rename to examples/sha2_crates_io/src/main.rs diff --git a/examples/cuda/vecadd/Cargo.toml b/examples/vecadd/Cargo.toml similarity index 81% rename from examples/cuda/vecadd/Cargo.toml rename to examples/vecadd/Cargo.toml index c916d4d5..aca2f476 100644 --- a/examples/cuda/vecadd/Cargo.toml +++ b/examples/vecadd/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -cust = { path = "../../../crates/cust" } +cust = { path = "../../crates/cust" } nanorand = "0.7" [build-dependencies] diff --git a/examples/cuda/vecadd/build.rs b/examples/vecadd/build.rs similarity index 100% rename from examples/cuda/vecadd/build.rs rename to examples/vecadd/build.rs diff --git a/examples/cuda/vecadd/kernels/Cargo.toml b/examples/vecadd/kernels/Cargo.toml similarity index 70% rename from examples/cuda/vecadd/kernels/Cargo.toml rename to examples/vecadd/kernels/Cargo.toml index cb84009d..d6581843 100644 --- a/examples/cuda/vecadd/kernels/Cargo.toml +++ b/examples/vecadd/kernels/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -cuda_std = { path = "../../../../crates/cuda_std" } +cuda_std = { path = "../../../crates/cuda_std" } [lib] crate-type = ["cdylib", "rlib"] diff --git a/examples/cuda/vecadd/kernels/src/lib.rs b/examples/vecadd/kernels/src/lib.rs similarity index 100% rename from examples/cuda/vecadd/kernels/src/lib.rs rename to examples/vecadd/kernels/src/lib.rs diff --git a/examples/cuda/vecadd/src/main.rs b/examples/vecadd/src/main.rs similarity index 100% rename from examples/cuda/vecadd/src/main.rs rename to examples/vecadd/src/main.rs