Skip to content

Commit

Permalink
partial refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
marsupialtail committed Nov 17, 2024
1 parent ed0f1a3 commit 66ddc09
Show file tree
Hide file tree
Showing 28 changed files with 3,145 additions and 2,351 deletions.
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rottnest"
version = "1.4.0"
version = "1.5.0"
edition = "2021"
build = "build.rs"

Expand All @@ -13,6 +13,7 @@ crate-type = ["cdylib"]
default = [] #['py']
py = ["dep:pyo3", "pyarrow", "dep:pyo3-log"]
pyarrow = ["arrow/pyarrow"]
logcloud = ["dep:libc"]


[dependencies]
Expand Down Expand Up @@ -86,7 +87,7 @@ ordered-float = "4.2.0"
reqwest = "0.12.4"
redis = {version = "0", features = ["aio", "tokio-comp"] }
divsufsort = "2.0.0"
libc = "0.2.158"
libc = { version = "0.2.158", optional = true }

[profile.release]
lto = false
Expand Down
16 changes: 10 additions & 6 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use std::env;
use std::path::PathBuf;

#[cfg(feature = "logcloud")]
fn main() {
use std::env;
use std::path::PathBuf;

let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
let path = PathBuf::from(dir);
let path = PathBuf::from(dir).join("src").join("lava").join("logcloud");

// Specify the directory containing the .a files
println!("cargo:rustc-link-search=native={}", path.display());
Expand All @@ -18,6 +19,9 @@ fn main() {
println!("cargo:rustc-link-lib=dylib=stdc++");

// Rerun the build script if the static libraries change
println!("cargo:rerun-if-changed=libCompressor.a");
println!("cargo:rerun-if-changed=libTrainer.a");
println!("cargo:rerun-if-changed=src/lava/logcloud/libCompressor.a");
println!("cargo:rerun-if-changed=src/lava/logcloud/libTrainer.a");
}

#[cfg(not(feature = "logcloud"))]
fn main() {}
87 changes: 0 additions & 87 deletions python/rottnest/ahupuaa.py

This file was deleted.

Loading

0 comments on commit 66ddc09

Please sign in to comment.