This repository has been archived by the owner on Jan 3, 2023. It is now read-only.
forked from tensorflow/ngraph-bridge
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathtf2changes.patch
292 lines (281 loc) · 11.3 KB
/
tf2changes.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
diff --git a/README.md b/README.md
index a11caa1d..d09c4514 100644
--- a/README.md
+++ b/README.md
@@ -131,10 +131,10 @@ Verify that `ngraph-bridge` installed correctly:
This will produce something like this:
- TensorFlow version: 1.15.2
+ TensorFlow version: 2.0.0
nGraph bridge version: b'0.22.0-rc3'
nGraph version used for this build: b'0.28.0-rc.1+d2cd873'
- TensorFlow version used for this build: v1.15.2-0-g5d80e1e8e6
+ TensorFlow version used for this build: v2.0.0-0-g64c3d382ca
CXX11_ABI flag used for this build: 1
nGraph bridge built with Grappler: False
nGraph bridge built with Variables and Optimizers Enablement: False
diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index e4e15bca..a6e2bb78 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -43,11 +43,11 @@ http_archive(
http_archive(
name = "org_tensorflow",
- sha256 = "d95d75d26a298211b5e802842e87fda5b8b14f6ad83719377b391e5fb71b8746",
- strip_prefix = "tensorflow-1.15.2",
+ sha256 = "49b5f0495cd681cbcb5296a4476853d4aea19a43bdd9f179c928a977308a0617",
+ strip_prefix = "tensorflow-2.0.0",
urls = [
- "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v1.15.2.tar.gz",
- "https://github.com/tensorflow/tensorflow/archive/v1.15.2.tar.gz",
+ "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz",
+ "https://github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz",
],
)
diff --git a/configure_bazel.sh b/configure_bazel.sh
index db90f9df..dbd2abaa 100755
--- a/configure_bazel.sh
+++ b/configure_bazel.sh
@@ -25,7 +25,7 @@ rm -f .bazelrc
if python -c "import tensorflow" &> /dev/null; then
echo 'using installed tensorflow'
else
- pip install tensorflow==v1.15.2
+ pip install tensorflow==v2.0.0
pip install tensorflow_estimator
fi
diff --git a/ngraph_bridge/grappler/ngraph_optimizer.h b/ngraph_bridge/grappler/ngraph_optimizer.h
index 66ae04c0..1dbbd5dc 100644
--- a/ngraph_bridge/grappler/ngraph_optimizer.h
+++ b/ngraph_bridge/grappler/ngraph_optimizer.h
@@ -50,8 +50,6 @@ class NgraphOptimizer : public tensorflow::grappler::CustomGraphOptimizer {
string name() const override { return "NgraphOptimizer"; };
- bool UsesFunctionLibrary() const override { return true; }
-
Status Init(
const tensorflow::RewriterConfig_CustomGraphOptimizer* config) override;
diff --git a/python/setup.in.py b/python/setup.in.py
index 2f899f3d..6557a9c1 100644
--- a/python/setup.in.py
+++ b/python/setup.in.py
@@ -72,7 +72,7 @@ setup(
package_data= package_data_dict,
cmdclass={'bdist_wheel': BinaryBdistWheel},
install_requires=[
- "tensorflow==1.15.2",
+ "tensorflow==2.0.0",
],
extras_require={
'plaidml': ["plaidml>=0.6.3"],
diff --git a/test/ci/buildkite/run_pipeline.sh b/test/ci/buildkite/run_pipeline.sh
index 6909c370..e38c426f 100644
--- a/test/ci/buildkite/run_pipeline.sh
+++ b/test/ci/buildkite/run_pipeline.sh
@@ -7,12 +7,12 @@ echo "BUILDKITE_REPO: $BUILDKITE_REPO"
echo "PIPELINE OS: $PIPELINE_QUEUE"
if [[ $PIPELINE_QUEUE = 'cpu' ]]; then
- TF_PY_WHEEL=tensorflow-1.15.2-cp36-cp36m-linux_x86_64.whl
+ TF_PY_WHEEL=tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl
# For the time being - hardcode the file
# Eventually we will replace the queue and other variables during the pipeline creation
STEPS_FILE=ngtf-cpu_ubuntu.yaml
elif [[ $PIPELINE_QUEUE = 'cpu-centos' ]]; then
- TF_PY_WHEEL=tensorflow-1.15.2-cp36-cp36m-linux_x86_64.whl
+ TF_PY_WHEEL=tensorflow-2.0.0-cp36-cp36m-linux_x86_64.whl
STEPS_FILE=ngtf-cpu_centos.yaml
else
echo "Unknown PILELINE_QUEUE: $PIPELINE_QUEUE"
diff --git a/test/model_level_tests/models/MLP/test1/expected.json b/test/model_level_tests/models/MLP/test1/expected.json
index 118c6cab..86346f76 100644
--- a/test/model_level_tests/models/MLP/test1/expected.json
+++ b/test/model_level_tests/models/MLP/test1/expected.json
@@ -17,17 +17,17 @@
"num_nodes_marked_for_clustering": 0
},
"3": {
- "num_ng_clusters": 9,
- "num_nodes_in_graph": 268,
- "num_nodes_marked_for_clustering": 176
+ "num_ng_clusters": 19,
+ "num_nodes_in_graph": 447,
+ "num_nodes_marked_for_clustering": 301
},
"4": {
- "num_ng_clusters": 4,
- "num_nodes_in_graph": 78,
- "num_nodes_marked_for_clustering": 47
+ "num_ng_clusters": 12,
+ "num_nodes_in_graph": 147,
+ "num_nodes_marked_for_clustering": 115
}
},
- "time": 5.185155630111694
+ "time": 7.095110654830933
},
"grappler": {
"logparse": {
diff --git a/test/model_level_tests/models/MLP/test2/expected.json b/test/model_level_tests/models/MLP/test2/expected.json
index 87388509..87372cd5 100644
--- a/test/model_level_tests/models/MLP/test2/expected.json
+++ b/test/model_level_tests/models/MLP/test2/expected.json
@@ -17,17 +17,17 @@
"num_nodes_marked_for_clustering": 0
},
"3": {
- "num_ng_clusters": 11,
- "num_nodes_in_graph": 413,
- "num_nodes_marked_for_clustering": 285
+ "num_ng_clusters": 20,
+ "num_nodes_in_graph": 649,
+ "num_nodes_marked_for_clustering": 466
},
"4": {
- "num_ng_clusters": 6,
- "num_nodes_in_graph": 91,
- "num_nodes_marked_for_clustering": 56
+ "num_ng_clusters": 13,
+ "num_nodes_in_graph": 165,
+ "num_nodes_marked_for_clustering": 129
}
},
- "time": 9.94468641281128
+ "time": 11.121156454086304
},
"grappler": {
"logparse": {
diff --git a/test_ngtf.py b/test_ngtf.py
index 72c54b2e..b5f1d0ac 100755
--- a/test_ngtf.py
+++ b/test_ngtf.py
@@ -99,7 +99,7 @@ def main():
if (not os.path.isdir(build_dir + '/tensorflow')):
download_repo(build_dir + "/tensorflow",
- "https://github.com/tensorflow/tensorflow.git", "v1.15.2")
+ "https://github.com/tensorflow/tensorflow.git", "v2.0.0")
# Next run the TensorFlow python tests
os.environ['NGRAPH_TF_LOG_0_DISABLED'] = '1'
diff --git a/tf2changes.patch b/tf2changes.patch
index f0662b2c..bb454c2a 100644
--- a/tf2changes.patch
+++ b/tf2changes.patch
@@ -1,121 +0,0 @@
-diff --git a/README.md b/README.md
-index a11caa1d..d09c4514 100644
---- a/README.md
-+++ b/README.md
-@@ -131,10 +131,10 @@ Verify that `ngraph-bridge` installed correctly:
-
- This will produce something like this:
-
-- TensorFlow version: 1.15.2
-+ TensorFlow version: 2.0.0
- nGraph bridge version: b'0.22.0-rc3'
- nGraph version used for this build: b'0.28.0-rc.1+d2cd873'
-- TensorFlow version used for this build: v1.15.2-0-g5d80e1e8e6
-+ TensorFlow version used for this build: v2.0.0-0-g64c3d382ca
- CXX11_ABI flag used for this build: 1
- nGraph bridge built with Grappler: False
- nGraph bridge built with Variables and Optimizers Enablement: False
-diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
-index e4e15bca..a6e2bb78 100644
---- a/bazel/WORKSPACE
-+++ b/bazel/WORKSPACE
-@@ -43,11 +43,11 @@ http_archive(
-
- http_archive(
- name = "org_tensorflow",
-- sha256 = "d95d75d26a298211b5e802842e87fda5b8b14f6ad83719377b391e5fb71b8746",
-- strip_prefix = "tensorflow-1.15.2",
-+ sha256 = "49b5f0495cd681cbcb5296a4476853d4aea19a43bdd9f179c928a977308a0617",
-+ strip_prefix = "tensorflow-2.0.0",
- urls = [
-- "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v1.15.2.tar.gz",
-- "https://github.com/tensorflow/tensorflow/archive/v1.15.2.tar.gz",
-+ "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz",
-+ "https://github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz",
- ],
- )
-
-diff --git a/ngraph_bridge/grappler/ngraph_optimizer.h b/ngraph_bridge/grappler/ngraph_optimizer.h
-index 66ae04c0..1dbbd5dc 100644
---- a/ngraph_bridge/grappler/ngraph_optimizer.h
-+++ b/ngraph_bridge/grappler/ngraph_optimizer.h
-@@ -50,8 +50,6 @@ class NgraphOptimizer : public tensorflow::grappler::CustomGraphOptimizer {
-
- string name() const override { return "NgraphOptimizer"; };
-
-- bool UsesFunctionLibrary() const override { return true; }
--
- Status Init(
- const tensorflow::RewriterConfig_CustomGraphOptimizer* config) override;
-
-diff --git a/python/setup.in.py b/python/setup.in.py
-index 2f899f3d..6557a9c1 100644
---- a/python/setup.in.py
-+++ b/python/setup.in.py
-@@ -72,7 +72,7 @@ setup(
- package_data= package_data_dict,
- cmdclass={'bdist_wheel': BinaryBdistWheel},
- install_requires=[
-- "tensorflow==1.15.2",
-+ "tensorflow==2.0.0",
- ],
- extras_require={
- 'plaidml': ["plaidml>=0.6.3"],
-diff --git a/test/model_level_tests/models/MLP/test1/expected.json b/test/model_level_tests/models/MLP/test1/expected.json
-index 118c6cab..86346f76 100644
---- a/test/model_level_tests/models/MLP/test1/expected.json
-+++ b/test/model_level_tests/models/MLP/test1/expected.json
-@@ -17,17 +17,17 @@
- "num_nodes_marked_for_clustering": 0
- },
- "3": {
-- "num_ng_clusters": 9,
-- "num_nodes_in_graph": 268,
-- "num_nodes_marked_for_clustering": 176
-+ "num_ng_clusters": 19,
-+ "num_nodes_in_graph": 447,
-+ "num_nodes_marked_for_clustering": 301
- },
- "4": {
-- "num_ng_clusters": 4,
-- "num_nodes_in_graph": 78,
-- "num_nodes_marked_for_clustering": 47
-+ "num_ng_clusters": 12,
-+ "num_nodes_in_graph": 147,
-+ "num_nodes_marked_for_clustering": 115
- }
- },
-- "time": 5.185155630111694
-+ "time": 7.095110654830933
- },
- "grappler": {
- "logparse": {
-diff --git a/test/model_level_tests/models/MLP/test2/expected.json b/test/model_level_tests/models/MLP/test2/expected.json
-index 87388509..87372cd5 100644
---- a/test/model_level_tests/models/MLP/test2/expected.json
-+++ b/test/model_level_tests/models/MLP/test2/expected.json
-@@ -17,17 +17,17 @@
- "num_nodes_marked_for_clustering": 0
- },
- "3": {
-- "num_ng_clusters": 11,
-- "num_nodes_in_graph": 413,
-- "num_nodes_marked_for_clustering": 285
-+ "num_ng_clusters": 20,
-+ "num_nodes_in_graph": 649,
-+ "num_nodes_marked_for_clustering": 466
- },
- "4": {
-- "num_ng_clusters": 6,
-- "num_nodes_in_graph": 91,
-- "num_nodes_marked_for_clustering": 56
-+ "num_ng_clusters": 13,
-+ "num_nodes_in_graph": 165,
-+ "num_nodes_marked_for_clustering": 129
- }
- },
-- "time": 9.94468641281128
-+ "time": 11.121156454086304
- },
- "grappler": {
- "logparse": {