From a347bc7ccbda22e47ff8a276d9894e271c5d72bb Mon Sep 17 00:00:00 2001 From: Lukasz Kozuchowski Date: Wed, 20 May 2020 23:43:43 +0200 Subject: [PATCH 1/2] Include "C API" files in clang-format check --- .github/workflows/style_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/style_check.yml b/.github/workflows/style_check.yml index 344bb289..96ff60b3 100644 --- a/.github/workflows/style_check.yml +++ b/.github/workflows/style_check.yml @@ -33,7 +33,7 @@ jobs: - name: Lint with clang-format run: | # lint files (all .cpp and .h files) inplace - find ./src/bindings/PyDP -iname *.hpp -o -iname *.cpp -iname *.h -iname *.cc | xargs clang-format -i -style='file' + find ./src/bindings/ -iname *.hpp -o -iname *.cpp -o -iname *.h -o -iname *.cc | xargs clang-format -i -style='file' # print changes git diff src # already well formated if 'git diff' doesn't output From f7566f2ae9335eac4c0d70e7c6e1180adc61b3cc Mon Sep 17 00:00:00 2001 From: Lukasz Kozuchowski Date: Fri, 22 May 2020 02:28:34 +0200 Subject: [PATCH 2/2] Clang-format all files --- .../PyDP/algorithms/bounded_functions.cpp | 4 +-- src/bindings/PyDP/algorithms/rand.cpp | 8 ++--- src/bindings/PyDP/bindings.cpp | 2 +- src/bindings/c/c_api.cc | 36 +++++++++---------- src/bindings/c/c_api.h | 3 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/bindings/PyDP/algorithms/bounded_functions.cpp b/src/bindings/PyDP/algorithms/bounded_functions.cpp index 419e9cfd..3a6ac316 100644 --- a/src/bindings/PyDP/algorithms/bounded_functions.cpp +++ b/src/bindings/PyDP/algorithms/bounded_functions.cpp @@ -23,7 +23,7 @@ class BoundedMeanDummy : public Dummy { }; class BoundedSumDummy : public Dummy { -public: + public: using Dummy::Dummy; double Result(py::list l) override { return Result_BoundedSum(obj, l); @@ -31,7 +31,7 @@ class BoundedSumDummy : public Dummy { }; class BoundedStandardDeviationDummy : public Dummy { -public: + public: using Dummy::Dummy; double Result(py::list l) override { return Result_BoundedStandardDeviation(obj, l); diff --git a/src/bindings/PyDP/algorithms/rand.cpp b/src/bindings/PyDP/algorithms/rand.cpp index 2b1b9f5a..bc40c6df 100644 --- a/src/bindings/PyDP/algorithms/rand.cpp +++ b/src/bindings/PyDP/algorithms/rand.cpp @@ -1,14 +1,14 @@ // Provides bindings for rand +#include "differential_privacy/algorithms/rand.h" #include "../pydp_lib/casting.hpp" #include "pybind11/pybind11.h" -#include "differential_privacy/algorithms/rand.h" namespace py = pybind11; namespace dp = differential_privacy; -void declareRandFunctions(py::module & m) { - m.def("UniformDouble",&dp::UniformDouble); - m.def("Geometric",&dp::Geometric); +void declareRandFunctions(py::module& m) { + m.def("UniformDouble", &dp::UniformDouble); + m.def("Geometric", &dp::Geometric); } void init_algorithms_rand(py::module& m) { diff --git a/src/bindings/PyDP/bindings.cpp b/src/bindings/PyDP/bindings.cpp index c08d9fbc..4d98bfc4 100644 --- a/src/bindings/PyDP/bindings.cpp +++ b/src/bindings/PyDP/bindings.cpp @@ -23,7 +23,7 @@ void init_algorithms_distributions(py::module &); void init_algorithms_order_statistics(py::module &); // rand -void init_algorithms_rand(py::module&); +void init_algorithms_rand(py::module &); // proto void init_proto(py::module &); diff --git a/src/bindings/c/c_api.cc b/src/bindings/c/c_api.cc index 40cf9875..ae26297f 100644 --- a/src/bindings/c/c_api.cc +++ b/src/bindings/c/c_api.cc @@ -3,8 +3,8 @@ #include "differential_privacy/algorithms/algorithm.h" #include "differential_privacy/algorithms/bounded-mean.h" -#include "differential_privacy/algorithms/bounded-sum.h" #include "differential_privacy/algorithms/bounded-standard-deviation.h" +#include "differential_privacy/algorithms/bounded-sum.h" #include "absl/random/distributions.h" #include "differential_privacy/algorithms/order-statistics.h" @@ -51,24 +51,22 @@ double Result_BoundedSum(BoundedFunctionHelperObject* config, pybind11::list l) std::unique_ptr> sum; if (has_bounds) { sum = BoundedSum::Builder() - .SetEpsilon(config->epsilon) - .SetLower(config->lower) - .SetUpper(config->upper) - .Build() - .ValueOrDie(); + .SetEpsilon(config->epsilon) + .SetLower(config->lower) + .SetUpper(config->upper) + .Build() + .ValueOrDie(); } else { sum = - BoundedSum::Builder() - .SetEpsilon(config->epsilon) - .Build() - .ValueOrDie(); + BoundedSum::Builder().SetEpsilon(config->epsilon).Build().ValueOrDie(); } Output result = sum->Result(a.begin(), a.end()).ValueOrDie(); return GetValue(result); } -double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybind11::list l) { +double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, + pybind11::list l) { std::vector a; for (auto i : l) { @@ -78,16 +76,16 @@ double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybi if (has_bounds) { standard_deviation = BoundedStandardDeviation::Builder() - .SetEpsilon(config->epsilon) - .SetLower(config->lower) - .SetUpper(config->upper) - .Build() - .ValueOrDie(); + .SetEpsilon(config->epsilon) + .SetLower(config->lower) + .SetUpper(config->upper) + .Build() + .ValueOrDie(); } else { standard_deviation = BoundedStandardDeviation::Builder() - .SetEpsilon(config->epsilon) - .Build() - .ValueOrDie(); + .SetEpsilon(config->epsilon) + .Build() + .ValueOrDie(); } Output result = standard_deviation->Result(a.begin(), a.end()).ValueOrDie(); diff --git a/src/bindings/c/c_api.h b/src/bindings/c/c_api.h index 6c5abc44..ca93d1c6 100644 --- a/src/bindings/c/c_api.h +++ b/src/bindings/c/c_api.h @@ -31,7 +31,8 @@ extern double Result_BoundedMean(BoundedFunctionHelperObject* config, pybind11:: extern double Result_BoundedSum(BoundedFunctionHelperObject* config, pybind11::list a); -extern double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybind11::list a); +extern double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, + pybind11::list a); // Order statistics extern int64_t Result_Max(BoundedFunctionHelperObject* config, pybind11::list a,