Merge branch 'rc1-master'

.clang-format

@@ -4,32 +4,43 @@ UseTab: Never
 Language: Cpp
 Standard: Cpp11
 
+AccessModifierOffset: -4
+
 AlignConsecutiveDeclarations: true
+AlignConsecutiveAssignments: true
+AlignTrailingComments: true
+
 AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Inline
+
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: true
 
-BinPackArguments: true
-BinPackParameters: true
+BinPackArguments: false
+BinPackParameters: false
 
 BreakBeforeBraces: Allman
+BreakConstructorInitializersBeforeComma: true
 
-ColumnLimit: 0
+ColumnLimit: 100
+CommentPragmas: '.*'
 
 IndentCaseLabels: false
+IndentWrappedFunctionNames: true
 
 KeepEmptyLinesAtTheStartOfBlocks: false
-NamespaceIndentation: Inner
+NamespaceIndentation: All
 
 PointerAlignment: Left
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: true
+SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
-SpacesInSquareBrackets: true
+SpacesInSquareBrackets: false
 
+SortIncludes: false
+ReflowComments: true

.gitignore

@@ -68,3 +68,4 @@ tmp/
 config_args.txt
 .nfs*
 venv/
+.vscode/

CMakeLists.txt

@@ -0,0 +1,80 @@
+cmake_minimum_required (VERSION 2.8.11)
+project (aeon)
+
+set(AEON_VERSION 1.0.0)
+
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+
+# set directory where the custom finders live
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+set(CMAKE_CXX_COMPILER "clang++")
+set(CMAKE_CXX_FLAGS "-O3 -std=c++11")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
+
+# whitelist errors here
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat-pedantic")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-padded")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-weak-vtables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-global-constructors")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch-enum")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-undef")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-exit-time-destructors")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-prototypes")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-disabled-macro-expansion")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-documentation")
+
+# should remove these
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-conversion")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-conversion")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-duplicate-enum") # from numpy
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-used-but-marked-unused") # from sox
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-compat-deprecated-writable-strings")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
+
+find_package(OpenCV REQUIRED)
+include_directories(${OpenCV_INCLUDE_DIRS})
+
+# opecv_ts is for testing opencv. if it is left in the lib list then we get an error when
+# the unit test exits.
+list(REMOVE_ITEM OpenCV_LIBRARIES opencv_ts)
+
+find_package(CURL REQUIRED)
+include_directories(${CURL_INCLUDE_DIRS})
+
+find_package(PythonLibs)
+find_package(PythonInterp)
+
+if (PYTHONLIBS_FOUND)
+    find_package(NumPy)
+    if(NUMPY_FOUND)
+        set(PYTHON_FOUND true)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPYTHON_FOUND")
+        include_directories(${PYTHON_INCLUDE_DIR})
+        include_directories(${NUMPY_INCLUDE_DIRS})
+    else()
+        message("Numpy not found, Python interface not included")
+    endif(NUMPY_FOUND)
+else()
+    message("Python not found, Python interface not included")
+    set(PYTHON_LIBRARIES "")
+endif (PYTHONLIBS_FOUND)
+
+set(TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test/test_data)
+
+add_subdirectory(src)
+include_directories(src)
+add_subdirectory(test)
+add_subdirectory(examples)
+add_subdirectory(doc)
+

README.md

@@ -18,9 +18,9 @@ First grab aeon's dependencies:
 
     sudo dnf install opencv-devel clang libcurl-devel sox-devel
 
-For CentOS 7, the version of Clang available in the EPEL repository is too old 
-to understand the GCC flags that the Python extension build system imposes, so 
-we build the latest version of Clang from source (after first installing it's 
+For CentOS 7, the version of Clang available in the EPEL repository is too old
+to understand the GCC flags that the Python extension build system imposes, so
+we build the latest version of Clang from source (after first installing it's
 high and low level build systems)::
 
     sudo -i
@@ -49,9 +49,10 @@ high and low level build systems)::
     cmake -G "Ninja" -DCMAKE_BUILD_TYPE=release /llvm-3.9.0.src
     ninja && ninja install
 
-### To install aeon:
+### To install aeon rc1:
 
-    pip install git+https://github.com/NervanaSystems/aeon.git
+    git clone https://github.com/NervanaSystems/aeon.git --depth 1 --single-branch --branch rc1-master
+    mkdir -p aeon/build && cd $_ && cmake .. && pip install .
 
 Note: if installing system wide (as opposed to within a virtual environment) you may need to run `sudo`.