From 1ff6ec8aa06f8a11e8b1fc8d69e36eb75ab6bae4 Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Wed, 17 Jan 2024 00:49:24 +0400 Subject: [PATCH] mark numa feature as optional everywhere --- Cargo.toml | 14 +++++++++----- dsn/Cargo.toml | 10 +++++++--- farmer/Cargo.toml | 8 +++++--- node/Cargo.toml | 19 +++++++++++++------ substrate/Cargo.toml | 7 +++++-- traits/Cargo.toml | 10 +++++++--- utils/Cargo.toml | 7 +++++-- 7 files changed, 51 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0dbca112..d11f8b7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -sdk-dsn = { path = "dsn" } +sdk-dsn = { path = "dsn", default-features = false } sdk-farmer = { path = "farmer", default-features = false } -sdk-node = { path = "node" } -sdk-substrate = { path = "substrate" } -sdk-utils = { path = "utils" } +sdk-node = { path = "node", default-features = false } +sdk-substrate = { path = "substrate", default-features = false } +sdk-utils = { path = "utils", default-features = false } static_assertions = "1.1.0" subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } @@ -152,7 +152,11 @@ members = [ [features] default = ["numa"] numa = [ - "sdk-farmer/numa" + "sdk-farmer/numa", + "sdk-dsn/numa", + "sdk-utils/numa", + "sdk-node/numa", + "sdk-substrate/numa" ] integration-test = [ "sdk-utils/integration-test", diff --git a/dsn/Cargo.toml b/dsn/Cargo.toml index 82d7f2c4..0b047e0e 100644 --- a/dsn/Cargo.toml +++ b/dsn/Cargo.toml @@ -15,16 +15,20 @@ parking_lot = "0.12" prometheus-client = "0.22.0" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sdk-utils = { path = "../utils" } +sdk-utils = { path = "../utils", default-features = false } serde = { version = "1", features = ["derive"] } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } tracing = "0.1" [features] -default = [] +default = ["numa"] +numa = [ + "subspace-farmer/numa", + "sdk-utils/numa" +] integration-test = [ "sdk-utils/integration-test" ] diff --git a/farmer/Cargo.toml b/farmer/Cargo.toml index 794119bb..52acb0a8 100644 --- a/farmer/Cargo.toml +++ b/farmer/Cargo.toml @@ -17,8 +17,8 @@ libmimalloc-sys = { version = "0.1.35", features = ["extended"] } parking_lot = "0.12" pin-project = "1" rayon = "1.7.0" -sdk-traits = { path = "../traits" } -sdk-utils = { path = "../utils" } +sdk-traits = { path = "../traits", default-features = false } +sdk-utils = { path = "../utils", default-features = false } serde = { version = "1", features = ["derive"] } subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } @@ -36,7 +36,9 @@ tracing-futures = "0.2" [features] default = ["numa"] numa = [ - "subspace-farmer/numa" + "subspace-farmer/numa", + "sdk-traits/numa", + "sdk-utils/numa" ] integration-test = [ "sdk-utils/integration-test", diff --git a/node/Cargo.toml b/node/Cargo.toml index 861b2eec..481e3058 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -39,10 +39,10 @@ sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sdk-dsn = { path = "../dsn" } -sdk-substrate = { path = "../substrate" } -sdk-traits = { path = "../traits" } -sdk-utils = { path = "../utils" } +sdk-dsn = { path = "../dsn", default-features = false } +sdk-substrate = { path = "../substrate", default-features = false } +sdk-traits = { path = "../traits", default-features = false } +sdk-utils = { path = "../utils", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = "1" sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } @@ -55,7 +55,7 @@ sp-messenger = { git = "https://github.com/subspace/subspace", rev = "bd43510020 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } @@ -67,7 +67,14 @@ tokio-stream = { version = "0.1", features = ["sync", "time"] } tracing = "0.1" [features] -default = [] +default = ["numa"] +numa = [ + "sdk-dsn/numa", + "sdk-traits/numa", + "sdk-utils/numa", + "sdk-substrate/numa", + "subspace-farmer/numa" +] integration-test = [ "sdk-utils/integration-test", "sdk-dsn/integration-test", diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 579fa7c7..7e8e446a 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -17,14 +17,17 @@ sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkad sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } sc-state-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sdk-utils = { path = "../utils" } +sdk-utils = { path = "../utils", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = "1" sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } tokio = { version = "1.34.0", features = ["fs", "rt", "tracing"] } [features] -default = [] +default = ["numa"] +numa = [ + "sdk-utils/numa" +] integration-test = [ "sdk-utils/integration-test" ] diff --git a/traits/Cargo.toml b/traits/Cargo.toml index bb2260b5..a300da0b 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -8,13 +8,17 @@ edition = "2021" async-trait = "0.1" parking_lot = "0.12" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sdk-dsn = { path = "../dsn" } +sdk-dsn = { path = "../dsn", default-features = false } subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } [features] -default = [] +default = ["numa"] +numa = [ + "subspace-farmer/numa", + "sdk-dsn/numa" +] integration-test = [ "sdk-dsn/integration-test" ] diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 138e8d4d..1bbea80d 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -33,7 +33,7 @@ sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-s ss58-registry = "1.33" # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver` subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } @@ -42,5 +42,8 @@ tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "park tracing = "0.1" [features] -default = [] +default = ["numa"] +numa = [ + "subspace-farmer/numa" +] integration-test = []