Merge branch 'master' into bob/nbench_db

CMakeLists.txt

@@ -306,12 +306,12 @@ set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}")
 set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
 if (LINUX)
     if (DEFINED NGRAPH_RPATH)
+        set(CMAKE_BUILD_RPATH "$ORIGIN:${NGRAPH_RPATH}")
         set(CMAKE_INSTALL_RPATH "$ORIGIN:${NGRAPH_RPATH}")
     else()
+        set(CMAKE_BUILD_RPATH "$ORIGIN")
         set(CMAKE_INSTALL_RPATH "$ORIGIN")
     endif()
-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 endif()
 
 #-----------------------------------------------------------------------------------------------

python/requirements.txt

 six
 numpy==1.15.4; python_version == "3.4"
-numpy; python_version != "3.4"
+numpy==1.16.4; python_version == "2.7"
+numpy; python_version != "2.7" and python_version != "3.4"
 typing

python/setup.py

@@ -369,6 +369,9 @@ class BuildExt(build_ext):
 
 with open(os.path.join(PYNGRAPH_ROOT_DIR, 'requirements.txt')) as req:
     requirements = req.read().splitlines()
+    setup_requires = [
+        item for item in requirements if item.strip().startswith('numpy')
+    ]
 
 setup(
     name='ngraph-core',
@@ -385,7 +388,7 @@ setup(
     packages=packages,
     cmdclass={'build_ext': BuildExt},
     data_files=data_files,
-    setup_requires=['numpy==1.16.4'],
+    setup_requires=setup_requires,
     install_requires=requirements,
     zip_safe=False,
     extras_require={

src/ngraph/runtime/plaidml/CMakeLists.txt

@@ -74,3 +74,11 @@ target_include_directories(plaidml_backend SYSTEM PUBLIC ${PLAIDML_INCLUDE_DIRS}
 target_link_libraries(plaidml_backend PUBLIC ngraph libplaidml)
 install(TARGETS plaidml_backend LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB})
 
+set(CMAKE_MACOSX_RPATH 1)
+if(APPLE)
+    set_property(TARGET plaidml_backend PROPERTY INSTALL_RPATH "@loader_path/;@loader_path/../../..")
+elseif(DEFINED NGRAPH_RPATH)
+    set_property(TARGET plaidml_backend PROPERTY INSTALL_RPATH "\$ORIGIN;\$ORIGIN/../../..;${NGRAPH_RPATH}")
+else()
+    set_property(TARGET plaidml_backend PROPERTY INSTALL_RPATH "\$ORIGIN;\$ORIGIN/../../..")
+endif()

src/ngraph/runtime/plaidml/unit_test.manifest

@@ -315,16 +315,3 @@ avg_pool_3d_uneven_strided_padded
 rnn_cell_activation_function
 gru_cell_bias_clip
 gru_cell_linear_before_reset
-
-# After https://github.com/NervanaSystems/ngraph/pull/3262, these tests began
-# failing with what appear to be precision issues. That PR simply split the
-# old "backend_test.in.cpp" into multiple files. The only relevant side effect
-# I can think of here is that the order of test execution changed as a result.
-softmax_all
-softmax_axis
-softmax_underflow
-softmax_overflow
-sigmoid_n1c1h2w2
-sigmoid_n1c1h4
-sigmoid_bprop_n1c1h4
-lrn

test/backend/lrn.in.cpp

@@ -14,6 +14,16 @@
 // limitations under the License.
 //*****************************************************************************
 
+// clang-format off
+#ifdef ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#define DEFAULT_FLOAT_TOLERANCE_BITS ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#endif
+
+#ifdef ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#define DEFAULT_DOUBLE_TOLERANCE_BITS ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#endif
+// clang-format on
+
 #include "gtest/gtest.h"
 #include "ngraph/ngraph.hpp"
 #include "util/all_close.hpp"

test/backend/sigmoid.in.cpp

@@ -14,6 +14,16 @@
 // limitations under the License.
 //*****************************************************************************
 
+// clang-format off
+#ifdef ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#define DEFAULT_FLOAT_TOLERANCE_BITS ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#endif
+
+#ifdef ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#define DEFAULT_DOUBLE_TOLERANCE_BITS ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#endif
+// clang-format on
+
 #include "gtest/gtest.h"
 #include "ngraph/ngraph.hpp"
 #include "util/all_close.hpp"

test/backend/softmax.in.cpp

@@ -14,6 +14,16 @@
 // limitations under the License.
 //*****************************************************************************
 
+// clang-format off
+#ifdef ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#define DEFAULT_FLOAT_TOLERANCE_BITS ${BACKEND_NAME}_FLOAT_TOLERANCE_BITS
+#endif
+
+#ifdef ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#define DEFAULT_DOUBLE_TOLERANCE_BITS ${BACKEND_NAME}_DOUBLE_TOLERANCE_BITS
+#endif
+// clang-format on
+
 #include "gtest/gtest.h"
 #include "ngraph/ngraph.hpp"
 #include "util/all_close.hpp"