Skip to content

Commit 12849a2

Browse files
sarkars/Upgrade master to 25rc3, bring back failing tests, and add ignore (#197)
1 parent 7f179c3 commit 12849a2

File tree

10 files changed

+18
-16
lines changed

10 files changed

+18
-16
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ if (NOT USE_PRE_BUILT_NGRAPH)
234234
ExternalProject_Add(
235235
ext_ngraph
236236
GIT_REPOSITORY https://github.com/NervanaSystems/ngraph
237-
GIT_TAG v0.25.0-rc.2
237+
GIT_TAG v0.25.0-rc.3
238238
CMAKE_ARGS
239239
-DNGRAPH_DISTRIBUTED_ENABLE=${NGRAPH_DISTRIBUTED_ENABLE}
240240
-DNGRAPH_INSTALL_PREFIX=${NGRAPH_ARTIFACTS_DIR}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Once TensorFlow's dependencies are installed, clone the `ngraph-bridge` repo:
8888

8989
git clone https://github.com/tensorflow/ngraph-bridge.git
9090
cd ngraph-bridge
91-
git checkout v0.18.0-rc1
91+
git checkout v0.18.0-rc2
9292

9393
Run the following Python script to build TensorFlow, nGraph, and the bridge. Use Python 3.5:
9494

bazel/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ tf_configure(
2525
http_archive(
2626
name = "ngraph",
2727
build_file = "//:bazel/ngraph.BUILD",
28-
sha256 = "54bffb90bb6ed8081d549958368b4eb95b8544ff59bc38a0783e6e8b3e623d48",
29-
strip_prefix = "ngraph-0.25.0-rc.2",
28+
sha256 = "0b0cbd617653552d219c05bf975acfbcac513061a7b04465a71db324a9d9d7e3",
29+
strip_prefix = "ngraph-0.25.0-rc.3",
3030
urls = [
31-
"https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.2.tar.gz",
32-
"https://github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.2.tar.gz"
31+
"https://mirror.bazel.build/github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.3.tar.gz",
32+
"https://github.com/NervanaSystems/ngraph/archive/v0.25.0-rc.3.tar.gz"
3333
],
3434
)
3535

build_ngtf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def main():
5353
'''
5454

5555
# Component versions
56-
ngraph_version = "v0.25.0-rc.2"
56+
ngraph_version = "v0.25.0-rc.3"
5757
tf_version = "v1.14.0"
5858

5959
# Command line parser options

ngraph_bridge/version.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// candidate such as v0.7.0-rc0
3333
// The code in master will always have the last released version number
3434
// with a suffix of '-master'
35-
#define NG_TF_VERSION_SUFFIX "-rc1"
35+
#define NG_TF_VERSION_SUFFIX "-rc2"
3636

3737
#define VERSION_STR_HELPER(x) #x
3838
#define VERSION_STR(x) VERSION_STR_HELPER(x)

python/setup.in.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def get_tag(self):
5959

6060
setup(
6161
name='ngraph_tensorflow_bridge',
62-
version='0.18.0rc1',
62+
version='0.18.0rc2',
6363
description='Intel nGraph compiler and runtime for TensorFlow',
6464
long_description=long_description,
6565
long_description_content_type="text/markdown",

test/python/tensorflow/python_tests_list.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ reduction_ops_test.MeanReductionTest.testEmptyGradients
344344
reduction_ops_test.MeanReductionTest.testFloat32
345345
reduction_ops_test.MeanReductionTest.testFloat64
346346
reduction_ops_test.MeanReductionTest.testGradient
347-
#reduction_ops_test.MeanReductionTest.testInfinity
347+
reduction_ops_test.MeanReductionTest.testInfinity
348348
reduction_ops_test.MeanReductionTest.testInt32
349349

350350
reduction_ops_test.MinReductionTest.testAxesType
@@ -368,7 +368,7 @@ reduction_ops_test.SumReductionTest.testFloat32
368368
reduction_ops_test.SumReductionTest.testFloat64
369369
reduction_ops_test.SumReductionTest.testGradient
370370
reduction_ops_test.SumReductionTest.testHighRank
371-
#reduction_ops_test.SumReductionTest.testInfinity
371+
reduction_ops_test.SumReductionTest.testInfinity
372372
reduction_ops_test.SumReductionTest.testInt32
373373
reduction_ops_test.SumReductionTest.testPartialShapes
374374

test/python/tensorflow/python_tests_list_gpu.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ reduction_ops_test.MeanReductionTest.testEmptyGradients
334334
reduction_ops_test.MeanReductionTest.testFloat32
335335
reduction_ops_test.MeanReductionTest.testFloat64
336336
reduction_ops_test.MeanReductionTest.testGradient
337-
#reduction_ops_test.MeanReductionTest.testInfinity
337+
reduction_ops_test.MeanReductionTest.testInfinity
338338
reduction_ops_test.MeanReductionTest.testInt32
339339

340340
reduction_ops_test.MinReductionTest.testAxesType
@@ -358,7 +358,7 @@ reduction_ops_test.SumReductionTest.testFloat32
358358
reduction_ops_test.SumReductionTest.testFloat64
359359
reduction_ops_test.SumReductionTest.testGradient
360360
#reduction_ops_test.SumReductionTest.testHighRank
361-
#reduction_ops_test.SumReductionTest.testInfinity
361+
reduction_ops_test.SumReductionTest.testInfinity
362362
reduction_ops_test.SumReductionTest.testInt32
363363
reduction_ops_test.SumReductionTest.testPartialShapes
364364

test/python/tensorflow/python_tests_list_mac.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ reduction_ops_test.MeanReductionTest.testEmptyGradients
344344
reduction_ops_test.MeanReductionTest.testFloat32
345345
reduction_ops_test.MeanReductionTest.testFloat64
346346
reduction_ops_test.MeanReductionTest.testGradient
347-
#reduction_ops_test.MeanReductionTest.testInfinity
347+
reduction_ops_test.MeanReductionTest.testInfinity
348348
reduction_ops_test.MeanReductionTest.testInt32
349349

350350
reduction_ops_test.MinReductionTest.testAxesType
@@ -368,7 +368,7 @@ reduction_ops_test.SumReductionTest.testFloat32
368368
reduction_ops_test.SumReductionTest.testFloat64
369369
reduction_ops_test.SumReductionTest.testGradient
370370
reduction_ops_test.SumReductionTest.testHighRank
371-
#reduction_ops_test.SumReductionTest.testInfinity
371+
reduction_ops_test.SumReductionTest.testInfinity
372372
reduction_ops_test.SumReductionTest.testInt32
373373
reduction_ops_test.SumReductionTest.testPartialShapes
374374

tools/test_utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ def run_ngtf_pytests(venv_dir, build_dir):
124124
command_executor(["pip", "install", "-U", "pytest"])
125125
command_executor(["pip", "install", "-U", "psutil"])
126126

127-
cmd = 'python -m pytest ' + ('--junitxml=%s/xunit_pytest.xml' % build_dir)
127+
cmd = 'python -m pytest ' + (
128+
'--junitxml=%s/xunit_pytest.xml' %
129+
build_dir) + + "--ignore=" + build_dir + "/test/python/bfloat16"
128130
env = os.environ.copy()
129131
new_paths = venv_dir + '/bin/python3:' + os.path.abspath(
130132
build_dir) + ":" + os.path.abspath(mnist_dir)

0 commit comments

Comments
 (0)