diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 749c446..62e7747 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,6 +103,14 @@ jobs: run: brew install libtool if: runner.os == 'macOS' + - name: CUDA toolchain + uses: Jimver/cuda-toolkit@9b295696791d75d658d8de64c4a85097ad8abeaf # v0.2.16 + with: + cuda: '12.4.1' + method: network + sub-packages: '["nvcc", "cudart"]' + if: runner.os == 'Linux' || runner.os == 'Windows' + - name: Install Protoc uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0 with: @@ -134,26 +142,33 @@ jobs: restore-keys: | ${{ runner.os }}-cargo- - - name: Build app (Linux or macOS, modern) + - name: Build app (Linux, modern, CUDA) env: RUSTFLAGS: ${{ matrix.build.modern-rustflags }} run: | - cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production + cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --features cuda mv target/${{ matrix.build.target }}/production/space-acres target/${{ matrix.build.target }}/production/space-acres-modern - if: (runner.os == 'Linux' || runner.os == 'macOS') && matrix.build.modern-rustflags + if: runner.os == 'Linux' && matrix.build.modern-rustflags - - name: Build app (Windows, modern) + - name: Build app (Windows, modern, CUDA) env: RUSTFLAGS: ${{ matrix.build.modern-rustflags }} run: | - cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production + cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --features cuda Move-Item -Path target\${{ matrix.build.target }}\production\space-acres.exe -Destination target\${{ matrix.build.target }}\production\space-acres-modern.exe if: runner.os == 'Windows' && matrix.build.modern-rustflags - - name: Build app (normal) + - name: Build app (macOS, normal) env: RUSTFLAGS: ${{ matrix.build.rustflags }} run: cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production + if: runner.os == 'macOS' + + - name: Build app (Linux or Windows, normal, CUDA) + env: + RUSTFLAGS: ${{ matrix.build.rustflags }} + run: cargo -Zgitoxide -Zgit build --locked -Z build-std --target ${{ matrix.build.target }} --profile production --features cuda + if: runner.os == 'Linux' || runner.os == 'Windows' - name: Create bundle (macOS) run: | diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 63176c4..4c058c2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -121,6 +121,14 @@ jobs: run: brew install libtool if: runner.os == 'macOS' + - name: CUDA toolchain + uses: Jimver/cuda-toolkit@9b295696791d75d658d8de64c4a85097ad8abeaf # v0.2.16 + with: + cuda: '12.4.1' + method: network + sub-packages: '["nvcc", "cudart"]' + if: runner.os == 'Linux' || runner.os == 'Windows' + - name: Install Protoc uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0 with: @@ -150,6 +158,11 @@ jobs: - name: cargo clippy run: cargo -Zgitoxide -Zgit clippy --locked --all-targets -- -D warnings + if: runner.os == 'macOS' + + - name: cargo clippy + run: cargo -Zgitoxide -Zgit clippy --locked --all-targets --features cuda -- -D warnings + if: runner.os == 'Linux' || runner.os == 'Windows' cargo-test: strategy: diff --git a/Cargo.lock b/Cargo.lock index 272c8a0..314e143 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1253,8 +1253,9 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.12" -source = "git+https://github.com/supranational/blst.git#bcdedbfeb4316a3371c1b350f0cf5065103895c5" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" dependencies = [ "cc", "glob", @@ -2052,7 +2053,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "domain-block-preprocessor", "fp-account", @@ -2571,7 +2572,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2604,7 +2605,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "fixed-hash", "fp-account", @@ -5310,10 +5311,14 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sifraitech/rust-kzg?rev=c34b73916af9b8a699a74bd0186f82f25e72861c#c34b73916af9b8a699a74bd0186f82f25e72861c" +source = "git+https://github.com/grandinetech/rust-kzg?rev=6c8fcc623df3d7e8c0f30951a49bfea764f90bf4#6c8fcc623df3d7e8c0f30951a49bfea764f90bf4" dependencies = [ "blst", + "num_cpus", + "rayon", "sha2 0.10.8", + "siphasher 1.0.1", + "threadpool", ] [[package]] @@ -7823,7 +7828,7 @@ dependencies = [ "memmap2 0.5.10", "parking_lot 0.12.3", "rand", - "siphasher", + "siphasher 0.3.11", "snap", "winapi", ] @@ -9259,13 +9264,12 @@ dependencies = [ [[package]] name = "rust-kzg-blst" version = "0.1.0" -source = "git+https://github.com/sifraitech/rust-kzg?rev=c34b73916af9b8a699a74bd0186f82f25e72861c#c34b73916af9b8a699a74bd0186f82f25e72861c" +source = "git+https://github.com/grandinetech/rust-kzg?rev=6c8fcc623df3d7e8c0f30951a49bfea764f90bf4#6c8fcc623df3d7e8c0f30951a49bfea764f90bf4" dependencies = [ "blst", "hex", "kzg", "libc", - "num_cpus", "once_cell", "rayon", "smallvec", @@ -9727,7 +9731,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "futures", @@ -9768,7 +9772,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-oneshot", "futures", @@ -9802,7 +9806,7 @@ dependencies = [ [[package]] name = "sc-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "sc-client-api", "sc-executor", @@ -10163,7 +10167,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "atomic", "core_affinity", @@ -10397,7 +10401,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -10422,7 +10426,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" [[package]] name = "sc-sysinfo" @@ -10974,6 +10978,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -11093,7 +11103,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "parity-scale-codec", "scale-info", @@ -11117,7 +11127,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "docify", "integer-sqrt", @@ -11145,7 +11155,7 @@ dependencies = [ [[package]] name = "sp-auto-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "parity-scale-codec", "scale-info", @@ -11169,7 +11179,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -11263,7 +11273,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "log", @@ -11290,7 +11300,7 @@ dependencies = [ [[package]] name = "sp-core" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "array-bytes", "bitflags 1.3.2", @@ -11382,7 +11392,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "blake2b_simd", "byteorder", @@ -11427,7 +11437,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "proc-macro2", "quote", @@ -11447,7 +11457,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "parity-scale-codec", "sp-runtime 39.0.0 (git+https://github.com/subspace/polkadot-sdk?rev=5626154d0781ac9a6ffd5a6207ed237f425ae631)", @@ -11456,7 +11466,7 @@ dependencies = [ [[package]] name = "sp-domain-sudo" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "parity-scale-codec", @@ -11467,7 +11477,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -11499,7 +11509,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -11534,7 +11544,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "parity-scale-codec", @@ -11544,7 +11554,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "environmental", "parity-scale-codec", @@ -11589,7 +11599,7 @@ dependencies = [ [[package]] name = "sp-io" version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "bytes", "docify", @@ -11641,7 +11651,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -11672,7 +11682,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-trait", "frame-support", @@ -11694,7 +11704,7 @@ dependencies = [ [[package]] name = "sp-messenger-host-functions" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "domain-block-preprocessor", "parity-scale-codec", @@ -11751,7 +11761,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "sp-api", "subspace-core-primitives", @@ -11771,7 +11781,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "backtrace", "lazy_static", @@ -11801,7 +11811,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "39.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "docify", "either", @@ -11853,7 +11863,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11891,7 +11901,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "18.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "Inflector", "expander", @@ -11944,7 +11954,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "hash-db", "log", @@ -12008,7 +12018,7 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" [[package]] name = "sp-std" @@ -12018,7 +12028,7 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=5626154d0781ac9a6ffd5 [[package]] name = "sp-storage" version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12042,7 +12052,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "parity-scale-codec", "scale-info", @@ -12071,7 +12081,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "parity-scale-codec", "tracing", @@ -12116,7 +12126,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "ahash 0.8.11", "hash-db", @@ -12190,7 +12200,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "impl-trait-for-tuples", "log", @@ -12212,7 +12222,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "31.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -12239,7 +12249,7 @@ dependencies = [ [[package]] name = "space-acres" -version = "0.1.35" +version = "0.1.36" dependencies = [ "anyhow", "arc-swap", @@ -12311,6 +12321,7 @@ dependencies = [ "subspace-farmer-components", "subspace-networking", "subspace-proof-of-space", + "subspace-proof-of-space-gpu", "subspace-rpc-primitives", "subspace-runtime-primitives", "subspace-service", @@ -12362,6 +12373,16 @@ dependencies = [ "der", ] +[[package]] +name = "sppark" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55f3833d30846a26110dccb1d5366314c2c52516a9173b74238c16b24b1a9f9" +dependencies = [ + "cc", + "which", +] + [[package]] name = "ss58-registry" version = "1.47.0" @@ -12386,7 +12407,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-xcm" version = "14.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "array-bytes", "bounded-collections", @@ -12478,7 +12499,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "parity-scale-codec", "rayon", @@ -12491,9 +12512,10 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "blake3", + "blst", "bytes", "derive_more 1.0.0", "hex", @@ -12515,7 +12537,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "kzg", "rust-kzg-blst", @@ -12525,7 +12547,7 @@ dependencies = [ [[package]] name = "subspace-fake-runtime-api" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "domain-runtime-primitives", "frame-support", @@ -12557,7 +12579,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "anyhow", "async-lock", @@ -12595,6 +12617,7 @@ dependencies = [ "subspace-farmer-components", "subspace-networking", "subspace-proof-of-space", + "subspace-proof-of-space-gpu", "subspace-rpc-primitives", "substrate-bip39 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", @@ -12610,7 +12633,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-lock", "async-trait", @@ -12641,7 +12664,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "actix-web", "prometheus", @@ -12652,7 +12675,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "async-mutex", "async-trait", @@ -12690,7 +12713,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "chacha20", "derive_more 1.0.0", @@ -12699,13 +12722,26 @@ dependencies = [ "seq-macro", "sha2 0.10.8", "spin 0.9.8", + "static_assertions", + "subspace-core-primitives", +] + +[[package]] +name = "subspace-proof-of-space-gpu" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" +dependencies = [ + "blst", + "cc", + "rust-kzg-blst", + "sppark", "subspace-core-primitives", ] [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "aes 0.9.0-pre.1", "subspace-core-primitives", @@ -12715,7 +12751,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "hex", "parity-scale-codec", @@ -12728,7 +12764,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "frame-support", "frame-system", @@ -12744,7 +12780,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "array-bytes", "async-channel 1.9.0", @@ -12831,7 +12867,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a#9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" +source = "git+https://github.com/subspace/subspace?rev=3727d07430d323b5616a3908a2f87762f6acf6fc#3727d07430d323b5616a3908a2f87762f6acf6fc" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -12857,7 +12893,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -14870,7 +14906,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "10.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#d6f482d5593c3e791d7b3e92e95aa3c734e23794" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#e484c01500323432cad4532fa76ea903300c1308" dependencies = [ "Inflector", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index d9701c7..50b1fa0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "space-acres" description = "Space Acres is an opinionated GUI application for farming on Autonomys Network" license = "0BSD" -version = "0.1.35" +version = "0.1.36" authors = ["Nazar Mokrynskyi "] repository = "https://github.com/autonomys/space-acres" edition = "2021" @@ -68,14 +68,14 @@ reqwest = { version = "0.12.4", default-features = false, features = ["json", "r sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-network-types = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } schnellru = "0.2.3" semver = "1.0.23" @@ -85,22 +85,23 @@ simple_moving_average = "1.0.2" sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sp-blockchain = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } -sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -sp-objects = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } +sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +sp-objects = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", default-features = false } -subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "9dcfb38442e1ccc05cf936ed074c4a973cbdbe7a" } +subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-proof-of-space-gpu = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc", optional = true } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "3727d07430d323b5616a3908a2f87762f6acf6fc" } supports-color = "3.0.0" sys-locale = "0.3.1" tempfile = "3.10.1" @@ -132,6 +133,12 @@ default = ["numa"] numa = [ "subspace-farmer/numa" ] +cuda = [ + "_gpu", + "subspace-farmer/cuda", + "subspace-proof-of-space-gpu/cuda", +] +_gpu = [] # The list of dependencies below (which can be both direct and indirect dependencies) are crates # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs index 9937a1d..133dc13 100644 --- a/src/backend/farmer.rs +++ b/src/backend/farmer.rs @@ -31,6 +31,9 @@ use subspace_farmer::farm::{ use subspace_farmer::farmer_cache::{FarmerCache, FarmerCacheWorker}; use subspace_farmer::node_client::NodeClient; use subspace_farmer::plotter::cpu::CpuPlotter; +#[cfg(feature = "_gpu")] +use subspace_farmer::plotter::gpu::GpuPlotter; +use subspace_farmer::plotter::Plotter; use subspace_farmer::single_disk_farm::{ SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmOptions, }; @@ -307,6 +310,48 @@ where )?; let global_mutex = Arc::default(); + + #[cfg(feature = "_gpu")] + let mut modern_plotter = None::>; + #[cfg(not(feature = "_gpu"))] + let modern_plotter = None::>; + + #[cfg(feature = "cuda")] + { + use subspace_farmer::plotter::gpu::cuda::CudaRecordsEncoder; + use subspace_proof_of_space_gpu::cuda::cuda_devices; + + let cuda_devices = cuda_devices(); + let used_cuda_devices = (0..cuda_devices.len()).collect::>(); + + if cuda_devices.is_empty() { + debug!("No CUDA GPU devices found"); + } else { + info!(?used_cuda_devices, "Using CUDA GPUs"); + + let cuda_plotter = GpuPlotter::new( + piece_getter.clone(), + Arc::new(Semaphore::new(cuda_devices.len() + 1)), + cuda_devices + .into_iter() + .map(|cuda_device| { + CudaRecordsEncoder::new(cuda_device, Arc::clone(&global_mutex)) + }) + .collect::>() + .map_err(|error| { + anyhow::anyhow!("Failed to create CUDA records encoder: {error}") + })?, + Arc::clone(&global_mutex), + kzg.clone(), + erasure_coding.clone(), + None, + ) + .map_err(|error| anyhow::anyhow!("Failed to initialize CUDA plotter: {error}"))?; + + modern_plotter.replace(Arc::new(cuda_plotter)); + } + } + let legacy_cpu_plotter = Arc::new(CpuPlotter::<_, PosTableLegacy>::new( piece_getter.clone(), Arc::clone(&downloading_semaphore), @@ -317,16 +362,23 @@ where erasure_coding.clone(), None, )); - let modern_cpu_plotter = Arc::new(CpuPlotter::<_, PosTable>::new( - piece_getter.clone(), - downloading_semaphore, - plotting_thread_pool_manager.clone(), - record_encoding_concurrency, - Arc::clone(&global_mutex), - kzg.clone(), - erasure_coding.clone(), - None, - )); + let modern_plotter = if let Some(modern_plotter) = modern_plotter { + info!("CPU plotting for v1 farms was disabled due to detected faster plotting with GPU"); + + modern_plotter + } else { + let modern_cpu_plotter = Arc::new(CpuPlotter::<_, PosTable>::new( + piece_getter.clone(), + downloading_semaphore, + plotting_thread_pool_manager.clone(), + record_encoding_concurrency, + Arc::clone(&global_mutex), + kzg.clone(), + erasure_coding.clone(), + None, + )); + Arc::new(modern_cpu_plotter) + }; let (farms, plotting_delay_senders) = { let farms_total = disk_farms.len(); @@ -350,7 +402,7 @@ where let kzg = kzg.clone(); let erasure_coding = erasure_coding.clone(); let plotter_legacy = Arc::clone(&legacy_cpu_plotter); - let plotter = Arc::clone(&modern_cpu_plotter); + let plotter = Arc::clone(&modern_plotter); let global_mutex = Arc::clone(&global_mutex); let faster_read_sector_record_chunks_mode_barrier = Arc::clone(&faster_read_sector_record_chunks_mode_barrier);