From 3f2655ceb12e8f942eee75435fd531c9452304ca Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Wed, 8 Jan 2020 12:52:19 -0800 Subject: [PATCH 1/9] upgrade ngraph to v0.27.1-rc.3 --- CMakeLists.txt | 2 +- README.md | 2 +- bazel/WORKSPACE | 8 ++++---- bazel/ngraph.BUILD | 7 ++++--- build_ngtf.py | 2 +- ngraph_bridge/version.cc | 2 +- python/setup.in.py | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b62725b0..03f6aef90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH) ExternalProject_Add( ext_ngraph GIT_REPOSITORY https://github.com/NervanaSystems/ngraph - GIT_TAG v0.27.1-rc.1 + GIT_TAG v0.27.1-rc.3 CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/README.md b/README.md index cb6df7e5f..4358048c7 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Once TensorFlow's dependencies are installed, clone the `ngraph-bridge` repo: git clone https://github.com/tensorflow/ngraph-bridge.git cd ngraph-bridge - git checkout v0.21.0-rc2 + git checkout v0.22.0-rc2 Run the following Python script to build TensorFlow, nGraph, and the bridge. Use Python 3.5: diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index c3c8aa84e..513bf2f06 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "903991dfdb63304bc08bebab68e0fcb3e62690763b886c42178f363a0beb00f4", - strip_prefix = "ngraph-0.27.1-rc.1", + sha256 = "e8be24f47db1c763cbc794bd96f37f2dec77513eb195d149b0add9f084426be7", + strip_prefix = "ngraph-0.27.1-rc.3", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.1.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.1.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.3.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.3.tar.gz" ], ) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 7e3af362a..437f1e48e 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -68,12 +68,13 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"', + '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_STATIC_LIB_ENABLE', '-D NGRAPH_DYNAMIC_COMPONENTS_ENABLE', '-D NGRAPH_ENABLE_CPU_CONV_AUTO', + '-D NGRAPH_USE_LEGACY_MKLDNN', "-march=native", "-mtune=native", "-Wall", @@ -111,7 +112,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"', + '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', ] + CXX_ABI, @@ -270,7 +271,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.1\\"', + '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', diff --git a/build_ngtf.py b/build_ngtf.py index 8960ad84a..ffbeb769e 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "v0.27.1-rc.1" + ngraph_version = "v0.27.1-rc.3" tf_version = "v1.14.0" # Command line parser options diff --git a/ngraph_bridge/version.cc b/ngraph_bridge/version.cc index b47a3f206..506421f7e 100644 --- a/ngraph_bridge/version.cc +++ b/ngraph_bridge/version.cc @@ -24,7 +24,7 @@ // nGraph-TensorFlow bridge uses semantic versioning: see http://semver.org/ #define NG_TF_MAJOR_VERSION 0 -#define NG_TF_MINOR_VERSION 21 +#define NG_TF_MINOR_VERSION 22 #define NG_TF_PATCH_VERSION 0 // The version suffix is used for pre-release version numbers diff --git a/python/setup.in.py b/python/setup.in.py index 7d9b599d1..c87d36e88 100644 --- a/python/setup.in.py +++ b/python/setup.in.py @@ -59,7 +59,7 @@ def get_tag(self): setup( name='ngraph_tensorflow_bridge', - version='0.21.0rc2', + version='0.22.0rc2', description='Intel nGraph compiler and runtime for TensorFlow', long_description=long_description, long_description_content_type="text/markdown", From 471e30cbdd32d608d3b368abfdda5b1cc12af6f7 Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Wed, 8 Jan 2020 13:02:27 -0800 Subject: [PATCH 2/9] fix bazel build --- bazel/ngraph.BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 437f1e48e..f1b27e1d8 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -275,6 +275,7 @@ cc_library( "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', + '-D NGRAPH_USE_LEGACY_MKLDNN', "-march=native", "-mtune=native", "-Wall", From ee3b9b7ce53cf66c90fd9180a624cbc3fed8dfda Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Wed, 8 Jan 2020 13:02:27 -0800 Subject: [PATCH 3/9] fix bazel build --- bazel/ngraph.BUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 437f1e48e..a1984acf9 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -115,6 +115,7 @@ cc_library( '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', + '-D NGRAPH_USE_LEGACY_MKLDNN', ] + CXX_ABI, linkopts = [ "-Wl,-z,noexecstack", @@ -275,6 +276,7 @@ cc_library( "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', + '-D NGRAPH_USE_LEGACY_MKLDNN', "-march=native", "-mtune=native", "-Wall", From 0f1fc4afb0d5f58598063c488a32daaa74e4fb5d Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Wed, 8 Jan 2020 19:20:36 -0800 Subject: [PATCH 4/9] upgrade to latest r0.27.1 --- CMakeLists.txt | 2 +- bazel/WORKSPACE | 8 ++++---- bazel/ngraph.BUILD | 8 ++++---- build_ngtf.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03f6aef90..2d1e896e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH) ExternalProject_Add( ext_ngraph GIT_REPOSITORY https://github.com/NervanaSystems/ngraph - GIT_TAG v0.27.1-rc.3 + GIT_TAG c101988a125bd151d98239d151a258f5388205e9 CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index 513bf2f06..e872f4a0d 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "e8be24f47db1c763cbc794bd96f37f2dec77513eb195d149b0add9f084426be7", - strip_prefix = "ngraph-0.27.1-rc.3", + sha256 = "caf346d171a0bf4daa32553f1c2a2eb50ea48df05471b51e0eb892757687c6bb", + strip_prefix = "ngraph-c101988a125bd151d98239d151a258f5388205e9", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.3.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/v0.27.1-rc.3.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/c101988a125bd151d98239d151a258f5388205e9.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/c101988a125bd151d98239d151a258f5388205e9.tar.gz" ], ) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index a1984acf9..2ea038fba 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -68,7 +68,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', + '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_STATIC_LIB_ENABLE', @@ -112,7 +112,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', + '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_USE_LEGACY_MKLDNN', @@ -272,11 +272,11 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"v0.27.1-rc.3\\"', + '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', - '-D NGRAPH_USE_LEGACY_MKLDNN', + '-D NGRAPH_USE_LEGACY_MKLDNN=\\"TRUE\\"', "-march=native", "-mtune=native", "-Wall", diff --git a/build_ngtf.py b/build_ngtf.py index ffbeb769e..003c602a5 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "v0.27.1-rc.3" + ngraph_version = "c101988a125bd151d98239d151a258f5388205e9" # r0.27.1 tf_version = "v1.14.0" # Command line parser options From d07c46419df98afbadfdd21f4bdf127d524165e9 Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Thu, 9 Jan 2020 13:44:42 -0800 Subject: [PATCH 5/9] try upgrade to master --- CMakeLists.txt | 2 +- bazel/WORKSPACE | 8 ++++---- bazel/ngraph.BUILD | 6 +++--- build_ngtf.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d1e896e1..d39c5fe50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH) ExternalProject_Add( ext_ngraph GIT_REPOSITORY https://github.com/NervanaSystems/ngraph - GIT_TAG c101988a125bd151d98239d151a258f5388205e9 + GIT_TAG fbd99f340d162705a47014339134aea79f9ca3ed CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index e872f4a0d..f123bbbc9 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "caf346d171a0bf4daa32553f1c2a2eb50ea48df05471b51e0eb892757687c6bb", - strip_prefix = "ngraph-c101988a125bd151d98239d151a258f5388205e9", + sha256 = "3f00913fb8e3dc7726fa199da2f136314da904f11253403c63b8eeb5752fe8c8", + strip_prefix = "ngraph-fbd99f340d162705a47014339134aea79f9ca3ed", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/c101988a125bd151d98239d151a258f5388205e9.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/c101988a125bd151d98239d151a258f5388205e9.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/fbd99f340d162705a47014339134aea79f9ca3ed.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/fbd99f340d162705a47014339134aea79f9ca3ed.tar.gz" ], ) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 2ea038fba..701e79c6e 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -68,7 +68,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', + '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_STATIC_LIB_ENABLE', @@ -112,7 +112,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', + '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_USE_LEGACY_MKLDNN', @@ -272,7 +272,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"c101988a125bd151d98239d151a258f5388205e9\\"', + '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', diff --git a/build_ngtf.py b/build_ngtf.py index 003c602a5..c8c8652c9 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "c101988a125bd151d98239d151a258f5388205e9" # r0.27.1 + ngraph_version = "fbd99f340d162705a47014339134aea79f9ca3ed" # master Katarzyna Mitrus Add provenance tags to ONNX importer tf_version = "v1.14.0" # Command line parser options From 1be281f47edea92613d59467d30f5ee1c95ca410 Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Thu, 9 Jan 2020 14:11:13 -0800 Subject: [PATCH 6/9] minor --- build_ngtf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_ngtf.py b/build_ngtf.py index c8c8652c9..0b60615b2 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "fbd99f340d162705a47014339134aea79f9ca3ed" # master Katarzyna Mitrus Add provenance tags to ONNX importer + ngraph_version = "fbd99f340d162705a47014339134aea79f9ca3ed" # master: Katarzyna Mitrus Add provenance tags to ONNX importer tf_version = "v1.14.0" # Command line parser options From 03813a7208a9926303ff4d78d20020e41577061c Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Fri, 10 Jan 2020 13:56:39 -0800 Subject: [PATCH 7/9] upgrade to master --- CMakeLists.txt | 2 +- bazel/WORKSPACE | 8 ++++---- bazel/ngraph.BUILD | 6 +++--- build_ngtf.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d39c5fe50..f17c458ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH) ExternalProject_Add( ext_ngraph GIT_REPOSITORY https://github.com/NervanaSystems/ngraph - GIT_TAG fbd99f340d162705a47014339134aea79f9ca3ed + GIT_TAG master CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index f123bbbc9..341f6e240 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "3f00913fb8e3dc7726fa199da2f136314da904f11253403c63b8eeb5752fe8c8", - strip_prefix = "ngraph-fbd99f340d162705a47014339134aea79f9ca3ed", + sha256 = "265fa69c423bde3c8c56e5b2ec3860428d0eb63eaf9faba59fdd8261d44753f9", + strip_prefix = "ngraph-master", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/fbd99f340d162705a47014339134aea79f9ca3ed.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/fbd99f340d162705a47014339134aea79f9ca3ed.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/master.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/master.tar.gz" ], ) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 701e79c6e..6f89266e6 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -68,7 +68,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', + '-D NGRAPH_VERSION=\\"master\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_STATIC_LIB_ENABLE', @@ -112,7 +112,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', + '-D NGRAPH_VERSION=\\"master\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_USE_LEGACY_MKLDNN', @@ -272,7 +272,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"fbd99f340d162705a47014339134aea79f9ca3ed\\"', + '-D NGRAPH_VERSION=\\"master\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', diff --git a/build_ngtf.py b/build_ngtf.py index 0b60615b2..9bc6530e8 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "fbd99f340d162705a47014339134aea79f9ca3ed" # master: Katarzyna Mitrus Add provenance tags to ONNX importer + ngraph_version = "master" # master tf_version = "v1.14.0" # Command line parser options From 47f05e32989e4796355c8f0c3ac901d35cdd1903 Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Fri, 10 Jan 2020 14:06:18 -0800 Subject: [PATCH 8/9] remove sha --- bazel/WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index 341f6e240..5ce8c1595 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,7 +55,7 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "265fa69c423bde3c8c56e5b2ec3860428d0eb63eaf9faba59fdd8261d44753f9", + sha256 = "", strip_prefix = "ngraph-master", urls = [ "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/master.tar.gz", From a085440abff7d437ed8a11656bf4f299abb32c2f Mon Sep 17 00:00:00 2001 From: Shrestha Malik Date: Fri, 10 Jan 2020 17:56:51 -0800 Subject: [PATCH 9/9] upgrade to ng-core v0.28.0-rc.0 --- CMakeLists.txt | 2 +- bazel/WORKSPACE | 8 ++++---- bazel/ngraph.BUILD | 6 +++--- build_ngtf.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f17c458ed..822185312 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if (NOT USE_PRE_BUILT_NGRAPH) ExternalProject_Add( ext_ngraph GIT_REPOSITORY https://github.com/NervanaSystems/ngraph - GIT_TAG master + GIT_TAG v0.28.0-rc.0 CMAKE_ARGS -DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE} -DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR} diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index 5ce8c1595..541bb891e 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -55,11 +55,11 @@ tf_workspace(path_prefix = "", tf_repo_name = "org_tensorflow") http_archive( name = "ngraph", build_file = "//:bazel/ngraph.BUILD", - sha256 = "", - strip_prefix = "ngraph-master", + sha256 = "be59da1e04840b3980d3bcba7925b99ac2007e37e3952ef7c77caedba9734654", + strip_prefix = "ngraph-0.28.0-rc.0", urls = [ - "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/master.tar.gz", - "https://github.com/NervanaSystems/ngraph/archive/master.tar.gz" + "https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.28.0-rc.0.tar.gz", + "https://github.com/NervanaSystems/ngraph/archive/v0.28.0-rc.0.tar.gz" ], ) diff --git a/bazel/ngraph.BUILD b/bazel/ngraph.BUILD index 6f89266e6..ddc6b081d 100644 --- a/bazel/ngraph.BUILD +++ b/bazel/ngraph.BUILD @@ -68,7 +68,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"master\\"', + '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_STATIC_LIB_ENABLE', @@ -112,7 +112,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"master\\"', + '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_USE_LEGACY_MKLDNN', @@ -272,7 +272,7 @@ cc_library( "-fstack-protector-all", '-D SHARED_LIB_PREFIX=\\"lib\\"', '-D SHARED_LIB_SUFFIX=\\".so\\"', - '-D NGRAPH_VERSION=\\"master\\"', + '-D NGRAPH_VERSION=\\"v0.28.0-rc.0\\"', "-D NGRAPH_DEX_ONLY", '-D PROJECT_ROOT_DIR=\\"\\"', '-D NGRAPH_CPU_STATIC_LIB_ENABLE', diff --git a/build_ngtf.py b/build_ngtf.py index 9bc6530e8..71f7f0220 100755 --- a/build_ngtf.py +++ b/build_ngtf.py @@ -53,7 +53,7 @@ def main(): ''' # Component versions - ngraph_version = "master" # master + ngraph_version = "v0.28.0-rc.0" tf_version = "v1.14.0" # Command line parser options