Skip to content

Commit

Permalink
[chore] Crate Smash v1 (#1080)
Browse files Browse the repository at this point in the history
* Refactor our daft build to be organized into subcrates for better dep
management
* introduce rust-analyzer profile to not conflict with regular build
  • Loading branch information
samster25 committed Jun 22, 2023
1 parent cd59693 commit 4233613
Show file tree
Hide file tree
Showing 167 changed files with 891 additions and 690 deletions.
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ repos:
hooks:
- id: fmt
- id: cargo-check
args: [--profile, rust-analyzer]
- id: cargo-check
name: cargo check --no-default-features
args: [--no-default-features]
args: [--no-default-features, --profile, rust-analyzer]
- id: clippy

- repo: https://github.com/abravalheri/validate-pyproject
Expand Down
110 changes: 85 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

134 changes: 59 additions & 75 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,90 +1,22 @@
[dependencies]
async-trait = "0.1.68"
aws-config = "0.55.3"
aws-sdk-s3 = "0.28.0"
base64 = "0.21.2"
bytes = "1.4.0"
chrono = "0.4.26"
chrono-tz = "0.8.2"
dyn-clone = "1.0.11"
fnv = "1.0.7"
futures = "0.3.28"
html-escape = "0.2.13"
ndarray = "0.15.6"
num-derive = "0.3.3"
prettytable-rs = "^0.10"
pyo3-log = "0.8.2"
rand = "^0.8"
serde_json = "1.0.96"
snafu = "0.7.4"
tokio = {version = "1.28.2", features = ["net", "time", "bytes", "process", "signal", "macros", "rt", "rt-multi-thread"]}
url = "2.4.0"

[dependencies.arrow2]
branch = "clark/expand-casting-support"
features = ["chrono-tz", "compute_take", "compute_cast", "compute_aggregate", "compute_if_then_else", "compute_sort", "compute_filter", "compute_temporal", "compute_comparison", "compute_arithmetics", "compute_concatenate", "io_ipc"]
git = "https://github.com/Eventual-Inc/arrow2"
package = "arrow2"
version = "0.17.1"

[dependencies.bincode]
version = "1.3.3"

[dependencies.image]
default-features = false
features = ["gif", "jpeg", "ico", "png", "tiff", "webp", "bmp", "hdr"]
version = "0.24.6"

[dependencies.indexmap]
features = ["serde"]
version = "1.9.2"

[dependencies.lazy_static]
version = "1.4.0"

[dependencies.log]
features = ["std"]
version = "0.4.19"

[dependencies.num-traits]
version = "0.2"

[dependencies.numpy]
optional = true
version = "0.18"

[dependencies.pyo3]
features = ["extension-module", "abi3-py37"]
optional = true
version = "0.18.3"

[dependencies.reqwest]
default-features = false
features = ["stream", "rustls-tls"]
version = "0.11.18"

[dependencies.serde]
features = ["derive", "rc"]
version = "1.0.164"

[dependencies.xxhash-rust]
features = ["xxh3", "const_xxh3"]
version = "0.8.5"
daft-core = {path = "src/daft-core", default-features = false}
daft-dsl = {path = "src/daft-dsl", default-features = false}
daft-table = {path = "src/daft-table", default-features = false}
pyo3 = {workspace = true, optional = true}
pyo3-log = {workspace = true, optional = true}

[features]
default = ["python"]
python = ["dep:pyo3", "dep:numpy"]
python = ["dep:pyo3", "dep:pyo3-log", "daft-core/python", "daft-table/python", "daft-dsl/python"]

[lib]
crate-type = ["cdylib"]
name = "daft"

[net]
git-fetch-with-cli = true

[package]
edition = "2021"
name = "daft"
publish = false
version = "0.1.6"

[profile.dev]
Expand All @@ -101,3 +33,55 @@ strip = "none" # dont strip
codegen-units = 1
inherits = "release"
lto = 'fat'

[profile.rust-analyzer]
inherits = "dev"

[workspace]
members = [
"src/common/error",
"src/daft-core",
"src/daft-io",
"src/daft-dsl",
"src/daft-table"
]

[workspace.dependencies]
html-escape = "0.2.13"
num-derive = "0.3.3"
num-traits = "0.2"
prettytable-rs = "0.10"
rand = "^0.8"
serde_json = "1.0.96"

[workspace.dependencies.arrow2]
branch = "clark/expand-casting-support"
features = ["chrono-tz", "compute_take", "compute_cast", "compute_aggregate", "compute_if_then_else", "compute_sort", "compute_filter", "compute_temporal", "compute_comparison", "compute_arithmetics", "compute_concatenate", "io_ipc"]
git = "https://github.com/Eventual-Inc/arrow2"
package = "arrow2"
version = "0.17.1"

[workspace.dependencies.bincode]
version = "1.3.3"

[workspace.dependencies.lazy_static]
version = "1.4.0"

[workspace.dependencies.log]
features = ["std"]
version = "0.4.19"

[workspace.dependencies.pyo3]
features = ["extension-module", "abi3-py37"]
version = "0.19.0"

[workspace.dependencies.pyo3-log]
version = "0.8.2"

[workspace.dependencies.serde]
features = ["derive", "rc"]
version = "1.0.164"

[workspace.package]
edition = "2021"
version = "0.1.0"
13 changes: 13 additions & 0 deletions src/common/error/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[dependencies]
arrow2 = {workspace = true}
pyo3 = {workspace = true, optional = true}
serde_json = {workspace = true}

[features]
default = ["python"]
python = ["dep:pyo3"]

[package]
edition = {workspace = true}
name = "common-error"
version = {workspace = true}
Loading

0 comments on commit 4233613

Please sign in to comment.