Skip to content

Commit

Permalink
chore: Renamed hydroflow to dfir_rs.
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitkulshreshtha committed Dec 20, 2024
1 parent ad8e1f5 commit 126493b
Show file tree
Hide file tree
Showing 853 changed files with 2,897 additions and 2,910 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ jobs:
CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: wasm-bindgen-test-runner
with:
command: test
args: -p hydroflow --target wasm32-unknown-unknown --tests --no-fail-fast
args: -p dfir_rs --target wasm32-unknown-unknown --tests --no-fail-fast

build-website:
name: Build Website
Expand Down
110 changes: 55 additions & 55 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = [
"hydro_deploy/hydro_cli",
"hydro_deploy/hydro_cli_examples",
"hydro_deploy/hydroflow_deploy_integration",
"hydroflow",
"dfir_rs",
"dfir_datalog",
"dfir_datalog_core",
"dfir_lang",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \

RUN mkdir -p xfer/examples
RUN ls -dR target/*/release/examples/* | grep -vE '^.*/[a-z_]+\-.*$' | grep -vE '^.*\.d$' | xargs -I{} cp {} xfer/examples/
RUN mkdir -p xfer/example_utils && cp hydroflow/example_utils/* xfer/example_utils/.
RUN mkdir -p xfer/example_utils && cp dfir_rs/example_utils/* xfer/example_utils/.

# Runtime stage
FROM rust:slim-buster
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ To (dry) run the command locally to spot-check for errors and warnings:
cargo smart-release --update-crates-index \
--no-changelog-preview --allow-fully-generated-changelogs \
--bump-dependencies auto --bump minor \ # or `patch`, `major`, `keep`, `auto`
hydroflow dfir_lang dfir_macro hydro_lang \
dfir_rs dfir_lang dfir_macro hydro_lang \
dfir_datalog dfir_datalog_core \
hydro_deploy hydro_cli hydroflow_cli_integration \
hydroflow_plus_cli_integration \
Expand Down
2 changes: 1 addition & 1 deletion benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workspace = true

[dev-dependencies]
criterion = { version = "0.5.0", features = [ "async_tokio", "html_reports" ] }
hydroflow = { path = "../hydroflow", features = [ "debugging" ] }
dfir_rs = { path = "../dfir_rs", features = [ "debugging" ] }
nameof = "1.0.0"
rand = "0.8.0"
rand_distr = "0.4.3"
Expand Down
12 changes: 6 additions & 6 deletions benches/benches/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::sync::mpsc::channel;
use std::thread;

use criterion::{black_box, criterion_group, criterion_main, Criterion};
use hydroflow::dfir_syntax;
use dfir_rs::dfir_syntax;
use static_assertions::const_assert;
use timely::dataflow::operators::{Inspect, Map, ToStream};

Expand Down Expand Up @@ -94,9 +94,9 @@ fn benchmark_iter_collect(c: &mut Criterion) {
}

fn benchmark_hydroflow_compiled(c: &mut Criterion) {
use hydroflow::pusherator::{InputBuild, Pusherator, PusheratorBuild};
use dfir_rs::pusherator::{InputBuild, Pusherator, PusheratorBuild};

c.bench_function("arithmetic/hydroflow/compiled", |b| {
c.bench_function("arithmetic/dfir_rs/compiled", |b| {
b.iter(|| {
let mut pusherator = InputBuild::<usize>::new()
.map(|x| x + 1)
Expand Down Expand Up @@ -131,9 +131,9 @@ fn benchmark_hydroflow_compiled(c: &mut Criterion) {
}

fn benchmark_hydroflow_compiled_no_cheating(c: &mut Criterion) {
use hydroflow::pusherator::{InputBuild, Pusherator, PusheratorBuild};
use dfir_rs::pusherator::{InputBuild, Pusherator, PusheratorBuild};

c.bench_function("arithmetic/hydroflow/compiled_no_cheating", |b| {
c.bench_function("arithmetic/dfir_rs/compiled_no_cheating", |b| {
b.iter(|| {
let mut pusherator = InputBuild::<usize>::new()
.map(|x| black_box(x + 1))
Expand Down Expand Up @@ -169,7 +169,7 @@ fn benchmark_hydroflow_compiled_no_cheating(c: &mut Criterion) {

fn benchmark_hydroflow_surface(c: &mut Criterion) {
const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20.
c.bench_function("arithmetic/hydroflow/surface", |b| {
c.bench_function("arithmetic/dfir_rs/surface", |b| {
b.iter_batched(
|| {
dfir_syntax! {
Expand Down
10 changes: 5 additions & 5 deletions benches/benches/fan_in.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use hydroflow::dfir_syntax;
use hydroflow::scheduled::handoff::Iter;
use hydroflow::scheduled::query::Query as Q;
use dfir_rs::dfir_syntax;
use dfir_rs::scheduled::handoff::Iter;
use dfir_rs::scheduled::query::Query as Q;
use static_assertions::const_assert;
use timely::dataflow::operators::{Concatenate, Inspect, ToStream};

Expand All @@ -13,7 +13,7 @@ fn make_ints(i: usize) -> impl Iterator<Item = usize> {
}

fn benchmark_hydroflow(c: &mut Criterion) {
c.bench_function("fan_in/hydroflow", |b| {
c.bench_function("fan_in/dfir_rs", |b| {
b.iter(|| {
let mut q = Q::new();

Expand All @@ -38,7 +38,7 @@ fn benchmark_hydroflow(c: &mut Criterion) {

fn benchmark_hydroflow_surface(c: &mut Criterion) {
const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20.
c.bench_function("fan_in/hydroflow/surface", |b| {
c.bench_function("fan_in/dfir_rs/surface", |b| {
b.iter(|| {
let mut df = dfir_syntax! {

Expand Down
10 changes: 5 additions & 5 deletions benches/benches/fan_out.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use hydroflow::dfir_syntax;
use hydroflow::scheduled::handoff::Iter;
use hydroflow::scheduled::query::Query as Q;
use dfir_rs::dfir_syntax;
use dfir_rs::scheduled::handoff::Iter;
use dfir_rs::scheduled::query::Query as Q;
use static_assertions::const_assert;
use timely::dataflow::operators::{Map, ToStream};

const NUM_OPS: usize = 20;
const NUM_INTS: usize = 1_000_000;

fn benchmark_hydroflow_scheduled(c: &mut Criterion) {
c.bench_function("fan_out/hydroflow/scheduled", |b| {
c.bench_function("fan_out/dfir_rs/scheduled", |b| {
b.iter(|| {
let mut q = Q::new();

Expand All @@ -30,7 +30,7 @@ fn benchmark_hydroflow_scheduled(c: &mut Criterion) {

fn benchmark_hydroflow_surface(c: &mut Criterion) {
const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20.
c.bench_function("fan_out/hydroflow/surface", |b| {
c.bench_function("fan_out/dfir_rs/surface", |b| {
b.iter(|| {
let mut df = dfir_syntax! {
my_tee = tee();
Expand Down
14 changes: 7 additions & 7 deletions benches/benches/fork_join.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use hydroflow::dfir_syntax;
use hydroflow::scheduled::graph::Hydroflow;
use hydroflow::scheduled::graph_ext::GraphExt;
use hydroflow::scheduled::handoff::{Iter, VecHandoff};
use hydroflow::scheduled::query::Query as Q;
use dfir_rs::dfir_syntax;
use dfir_rs::scheduled::graph::Hydroflow;
use dfir_rs::scheduled::graph_ext::GraphExt;
use dfir_rs::scheduled::handoff::{Iter, VecHandoff};
use dfir_rs::scheduled::query::Query as Q;
use timely::dataflow::operators::{Concatenate, Filter, Inspect, ToStream};

const NUM_OPS: usize = 20;
const NUM_INTS: usize = 100_000;
const BRANCH_FACTOR: usize = 2;

fn benchmark_hydroflow(c: &mut Criterion) {
c.bench_function("fork_join/hydroflow", |b| {
c.bench_function("fork_join/dfir_rs", |b| {
b.iter(|| {
let mut df = Hydroflow::new();

Expand Down Expand Up @@ -84,7 +84,7 @@ fn benchmark_hydroflow(c: &mut Criterion) {
}

fn benchmark_hydroflow_surface(c: &mut Criterion) {
c.bench_function("fork_join/hydroflow/surface", |b| {
c.bench_function("fork_join/dfir_rs/surface", |b| {
b.iter(|| {
let mut hf = include!("fork_join_20.hf");
hf.run_available();
Expand Down
Loading

0 comments on commit 126493b

Please sign in to comment.