clang-format-3.9 style

src/element_type.hpp

@@ -43,10 +43,10 @@ public:
 
 private:
     static std::map<std::string, ElementType> m_element_list;
-    size_t                                    m_bitwidth;
-    bool                                      m_is_float;
-    bool                                      m_is_signed;
-    const std::string                         m_cname;
+    size_t            m_bitwidth;
+    bool              m_is_float;
+    bool              m_is_signed;
+    const std::string m_cname;
 };
 
 extern const ngraph::ElementType element_type_float;

src/log.hpp

@@ -36,8 +36,7 @@ namespace nervana
             return i < _size ? _string[i] : throw std::out_of_range("");
         }
         constexpr const char* get_ptr(size_t offset) const { return &_string[offset]; }
-        constexpr size_t      size() const { return _size; }
-
+        constexpr size_t                     size() const { return _size; }
     private:
         const char* _string;
         size_t      _size;
@@ -45,9 +44,8 @@ namespace nervana
 
     constexpr const char* find_last(conststring s, size_t offset, char ch)
     {
-        return offset == 0
-                   ? s.get_ptr(0)
-                   : (s[offset] == ch ? s.get_ptr(offset + 1) : find_last(s, offset - 1, ch));
+        return offset == 0 ? s.get_ptr(0) : (s[offset] == ch ? s.get_ptr(offset + 1)
+                                                             : find_last(s, offset - 1, ch));
     }
 
     constexpr const char* find_last(conststring s, char ch)
@@ -69,7 +67,6 @@ namespace nervana
         ~log_helper();
 
         std::ostream& stream() { return _stream; }
-
     private:
         std::stringstream _stream;
     };
@@ -84,9 +81,9 @@ namespace nervana
         static void stop();
 
     private:
-        static void                    log_item(const std::string& s);
-        static void                    process_event(const std::string& s);
-        static void                    thread_entry(void* param);
+        static void log_item(const std::string& s);
+        static void process_event(const std::string& s);
+        static void thread_entry(void* param);
         static std::string             log_path;
         static std::deque<std::string> queue;
     };

src/names.cpp

@@ -18,7 +18,7 @@
 
 using namespace ngraph;
 
-size_t                               NameableValue::__counter = 0;
+size_t NameableValue::__counter = 0;
 std::map<std::string, NameableValue> NameableValue::__all_names;
 
 NameableValue::NameableValue(const std::string& name,

src/names.hpp

@@ -95,7 +95,7 @@ namespace ngraph
         //!-----------------------------------------------------------------------------------
         NameableValue& named(const std::string& name);
 
-        static size_t                               __counter;
+        static size_t __counter;
         static std::map<std::string, NameableValue> __all_names;
 
         std::string m_name;

src/strides.hpp

@@ -27,10 +27,9 @@ public:
                 ElementType                               et = element_type_float);
 
     const ElementType& get_type() const { return m_element_type; }
-
-    tensor_stride full_strides() const;
-    tensor_stride strides() const;
-    tensor_size   sizes() const;
+    tensor_stride      full_strides() const;
+    tensor_stride      strides() const;
+    tensor_size        sizes() const;
 
     tensor_size operator[](size_t index) const;
 
@@ -53,9 +52,8 @@ class ngraph::tensor_stride
 public:
     tensor_stride();
     const ElementType& get_type() const { return m_element_type; }
-
-    tensor_stride full_strides() const;
-    tensor_stride strides() const;
+    tensor_stride      full_strides() const;
+    tensor_stride      strides() const;
 
     tensor_stride reduce_strides() const;
 

src/transformers/axes.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
+#include <cassert>
+#include <cmath>
 #include <iostream>
 #include <sstream>
-#include <cmath>
-#include <cassert>
 
 #include "axes.hpp"
 #include "util.hpp"
@@ -268,7 +268,7 @@ Axis ngraph::slice_axis(const Axis& axis, const slice& s)
 std::vector<std::string> ngraph::duplicates(const std::vector<Axis>& ax)
 {
     std::map<std::string, size_t> counts;
-    std::vector<std::string>      rc;
+    std::vector<std::string> rc;
     for (const Axis& axis : ax)
     {
         auto it = counts.find(axis.name);

src/transformers/exop.cpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
+#include <cmath>
+#include <exception>
 #include <memory>
 #include <sstream>
-#include <exception>
-#include <cmath>
 
 #include "exop.hpp"
 #include "op_graph.hpp"
@@ -404,10 +404,10 @@ void ExOpBlock::add_ops(std::initializer_list<computation_op_ptr> roots, exop_pt
         }
     }
 
-    std::vector<op_ptr>                   available;
+    std::vector<op_ptr> available;
     std::map<op_ptr, size_t>              counts;
     std::map<op_ptr, std::vector<op_ptr>> parents;
-    std::vector<op_ptr>                   ready;
+    std::vector<op_ptr> ready;
 
     available.insert(available.end(), roots.begin(), roots.end());
     while (available.size() > 0)
@@ -1012,7 +1012,7 @@ tensor_decl_ptr ExecutionState::ensure_tensor_decl(ExecutionGraph&        execut
         bool is_constant     = false;
         bool is_compile_only = false;
 
-        tensor_decl                              = std::make_shared<TensorDecl>(execution_graph,
+        tensor_decl = std::make_shared<TensorDecl>(execution_graph,
                                                    tensor_description_base->element_type(),
                                                    tensor_description_base->tensor_size(),
                                                    tensor_description_base->is_persistent(),
@@ -1057,7 +1057,7 @@ tensor_decl_ptr ExecutionGraph::get_tensor_decl(op_ptr                 op,
         bool is_constant     = false;
         bool is_compile_only = false;
 
-        tensor_decl                           = std::make_shared<TensorDecl>(*this,
+        tensor_decl = std::make_shared<TensorDecl>(*this,
                                                    tensor_description_base->element_type(),
                                                    tensor_description_base->tensor_size(),
                                                    tensor_description_base->is_persistent(),

src/transformers/mock_transformer.hpp

@@ -14,24 +14,21 @@
 
 #pragma once
 
-#include "mock.hpp"
 #include "exop.hpp"
+#include "mock.hpp"
 
 namespace ngraph
 {
-
-//================================================================================================
-// CpuTransformer
-//================================================================================================
-class CpuTransformer : public Transformer
-{
-public:
-    virtual ~CpuTransformer() {}
-
-    ExecutionState& execution_state() override { return m_execution_state; }
-
-private:
-    ExecutionState m_execution_state;
-};
+    //================================================================================================
+    // CpuTransformer
+    //================================================================================================
+    class CpuTransformer : public Transformer
+    {
+    public:
+        virtual ~CpuTransformer() {}
+        ExecutionState& execution_state() override { return m_execution_state; }
+    private:
+        ExecutionState m_execution_state;
+    };
 
 } // end namespace ngraph

src/transformers/ndarray.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include "element_type.hpp"
 #include "strides.hpp"

src/transformers/op_graph.cpp

@@ -14,8 +14,8 @@
 
 #include <sstream>
 
-#include "op_graph.hpp"
 #include "axes.hpp"
+#include "op_graph.hpp"
 #include "util.hpp"
 
 using namespace ngraph;
@@ -2794,7 +2794,9 @@ ElementWiseOp::ElementWiseOp()
 {
 }
 
-void ElementWiseOp::ElementWiseOp_init(std::vector<op_ptr>, Axes) {}
+void ElementWiseOp::ElementWiseOp_init(std::vector<op_ptr>, Axes)
+{
+}
 
 //================================================================================================
 // UnaryElementWiseOp

src/tree.hpp

@@ -51,7 +51,6 @@ public:
     bool                     is_list() const { return m_is_list; }
     T                        get_value() const { return m_value; }
     const std::vector<tree>& get_list() const { return m_list; }
-
     static void traverse_tree(tree& s, std::function<void(T*)> func)
     {
         if (s.is_list())

src/util.hpp

@@ -83,10 +83,10 @@ namespace ngraph
     }
 
     size_t hash_combine(const std::vector<size_t>& list);
-    void   dump(std::ostream& out, const void*, size_t);
+    void dump(std::ostream& out, const void*, size_t);
 
-    std::string              to_lower(const std::string& s);
-    std::string              trim(const std::string& s);
+    std::string to_lower(const std::string& s);
+    std::string trim(const std::string& s);
     std::vector<std::string> split(const std::string& s, char delimiter, bool trim = false);
 
     class stopwatch
@@ -148,7 +148,6 @@ namespace ngraph
         size_t get_total_milliseconds() const { return get_total_nanoseconds() / 1e6; }
         size_t get_total_microseconds() const { return get_total_nanoseconds() / 1e3; }
         size_t get_total_nanoseconds() const { return m_total_time.count(); }
-
     private:
         std::chrono::high_resolution_clock                          m_clock;
         std::chrono::time_point<std::chrono::high_resolution_clock> m_start_time;

src/uuid.hpp

@@ -74,7 +74,6 @@ public:
     }
 
     bool operator!=(const uuid_type& other) const { return !(*this == other); }
-
     friend std::ostream& operator<<(std::ostream& out, const uuid_type& id)
     {
         out << id.to_string();

test/names.cpp

@@ -22,4 +22,6 @@
 
 using namespace ngraph;
 
-TEST(names, name) {}
+TEST(names, name)
+{
+}

test/util.cpp

@@ -134,7 +134,9 @@ TEST(util, contains)
     EXPECT_FALSE(contains(v1, 8));
 }
 
-TEST(util, remove_from) {}
+TEST(util, remove_from)
+{
+}
 
 TEST(util, reduce)
 {