Browse Source

Merge branch 'main' into unify-nodes-and-operators

tags/v0.2.0-candidate
Philipp Oppermann 2 years ago
parent
commit
6af931f24d
Failed to extract signature
5 changed files with 54 additions and 25 deletions
  1. +31
    -0
      .github/ISSUE_TEMPLATE/bug_report.md
  2. +20
    -0
      .github/ISSUE_TEMPLATE/feature_request.md
  3. +1
    -1
      LICENSE
  4. +1
    -12
      examples/c++-dataflow/run.rs
  5. +1
    -12
      examples/c-dataflow/run.rs

+ 31
- 0
.github/ISSUE_TEMPLATE/bug_report.md View File

@@ -0,0 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Dora start daemon: `dora up`
2. Start a new dataflow: `dora start dataflow.yaml`
3. Stop dataflow: `dora stop`
4. Destroy dataflow: `dora destroy`

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots or Video**
If applicable, add screenshots to help explain your problem.

**Environments (please complete the following information):**
- System info: [use `uname --all` on LInux]
- Dora version [use `dora --version` and `pip show dora-rs`]

**Additional context**
Add any other context about the problem here.

+ 20
- 0
.github/ISSUE_TEMPLATE/feature_request.md View File

@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.

+ 1
- 1
LICENSE View File

@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright [2022] [The Dora-rs Authors]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.


+ 1
- 12
examples/c++-dataflow/run.rs View File

@@ -260,7 +260,7 @@ async fn build_cxx_operator(
link.arg("-fms-runtime-lib=static");
}
link.arg("-o")
.arg(Path::new("../build").join(library_filename(out_name)));
.arg(Path::new("../build").join(format!("{DLL_PREFIX}{out_name}{DLL_SUFFIX}")));
if let Some(parent) = paths[0].parent() {
link.current_dir(parent);
}
@@ -271,17 +271,6 @@ async fn build_cxx_operator(
Ok(())
}

// taken from `rust_libloading` crate by Simonas Kazlauskas, licensed under the ISC license (
// see https://github.com/nagisa/rust_libloading/blob/master/LICENSE)
pub fn library_filename<S: AsRef<OsStr>>(name: S) -> OsString {
let name = name.as_ref();
let mut string = OsString::with_capacity(name.len() + DLL_PREFIX.len() + DLL_SUFFIX.len());
string.push(DLL_PREFIX);
string.push(name);
string.push(DLL_SUFFIX);
string
}

fn set_up_tracing() -> eyre::Result<()> {
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;



+ 1
- 12
examples/c-dataflow/run.rs View File

@@ -120,7 +120,7 @@ async fn build_c_operator() -> eyre::Result<()> {
let mut link = tokio::process::Command::new("clang");
link.arg("-shared").arg("build/operator.o");
link.arg("-o")
.arg(Path::new("build").join(library_filename("operator")));
.arg(Path::new("build").join(format!("{DLL_PREFIX}operator{DLL_SUFFIX}")));
if !link.status().await?.success() {
bail!("failed to link c operator");
};
@@ -128,17 +128,6 @@ async fn build_c_operator() -> eyre::Result<()> {
Ok(())
}

// taken from `rust_libloading` crate by Simonas Kazlauskas, licensed under the ISC license (
// see https://github.com/nagisa/rust_libloading/blob/master/LICENSE)
pub fn library_filename<S: AsRef<OsStr>>(name: S) -> OsString {
let name = name.as_ref();
let mut string = OsString::with_capacity(name.len() + DLL_PREFIX.len() + DLL_SUFFIX.len());
string.push(DLL_PREFIX);
string.push(name);
string.push(DLL_SUFFIX);
string
}

fn set_up_tracing() -> eyre::Result<()> {
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;



Loading…
Cancel
Save