Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a91be11

Browse files
author
Daniel Mané
committed
Fix conflicts.
1 parent e7db8ed commit a91be11

File tree

20 files changed

+2
-298
lines changed

20 files changed

+2
-298
lines changed

‎tensorflow/c/c_api.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,11 +1704,7 @@ void TF_ImportGraphDefOptionsAddInputMapping(TF_ImportGraphDefOptions* opts,
17041704
void TF_ImportGraphDefOptionsRemapControlDependency(
17051705
TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst) {
17061706
opts->opts.input_map[TensorId(src_name, tensorflow::Graph::kControlSlot)] =
1707-
<<<<<<< HEAD
1708-
TensorId(dst->node.name(), tensorflow::Graph::kControlSlot);
1709-
=======
17101707
TensorId(dst->node.name(), tensorflow::Graph::kControlSlot);
1711-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
17121708
}
17131709

17141710
extern void TF_ImportGraphDefOptionsAddControlDependency(

‎tensorflow/c/c_api.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -815,12 +815,7 @@ extern void TF_ImportGraphDefOptionsAddInputMapping(
815815
// `dst` references an operation already existing in the graph being imported
816816
// into.
817817
extern void TF_GraphImportGraphDefOptionsRemapControlDependency(
818-
<<<<<<< HEAD
819-
TF_ImportGraphDefOptions* opts, const char* src_name,
820-
TF_Operation* dst);
821-
=======
822818
TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst);
823-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
824819

825820
// Cause the imported graph to have a control dependency on `oper`. `oper`
826821
// should exist in the graph being imported into.

‎tensorflow/compiler/tf2xla/xla_compiler.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,8 @@ Status BuildArguments(const std::vector<XlaCompiler::Argument>& args,
225225
parameters.reserve(args.size());
226226
variables.reserve(args.size());
227227

228-
<<<<<<< HEAD
229-
for (std::vector<XlaCompiler::Argument>::size_type i = 0;
230-
i < args.size(); ++i) {
231-
=======
232228
for (std::vector<XlaCompiler::Argument>::size_type i = 0; i < args.size();
233229
++i) {
234-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
235230
XlaContext::Argument& context_arg = (*context_args)[i];
236231
context_arg.name = args[i].name;
237232
context_arg.value.constant_value = args[i].constant_value;

‎tensorflow/compiler/xla/client/computation_builder.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,9 @@ bool ComputationBuilder::MakeWindow(
106106
tensorflow::gtl::ArraySlice<std::pair<int64, int64>> padding,
107107
tensorflow::gtl::ArraySlice<int64> lhs_dilation,
108108
tensorflow::gtl::ArraySlice<int64> rhs_dilation, Window* window) {
109-
<<<<<<< HEAD
110-
const auto verify_size = [&](
111-
const tensorflow::gtl::ArraySlice<int64>::size_type x,
112-
const char* x_name) {
113-
=======
114109
const auto verify_size = [&](const tensorflow::gtl::ArraySlice<
115110
int64>::size_type x,
116111
const char* x_name) {
117-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
118112
if (x == 0 || x == window_dimensions.size()) {
119113
return true;
120114
} else {
@@ -702,11 +696,7 @@ ComputationDataHandle ComputationBuilder::ConvWithGeneralDimensions(
702696

703697
std::vector<int64> base_area_dimensions(
704698
dimension_numbers.spatial_dimensions_size());
705-
<<<<<<< HEAD
706-
for (std::vector<int64>::size_type i = 0; i < base_area_dimensions.size() ;
707-
=======
708699
for (std::vector<int64>::size_type i = 0; i < base_area_dimensions.size();
709-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
710700
++i) {
711701
base_area_dimensions[i] =
712702
lhs_shape->dimensions(dimension_numbers.spatial_dimensions(i));

‎tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,6 @@ - (void)setupAVCapture {
106106
[session startRunning];
107107

108108
if (error) {
109-
<<<<<<< HEAD
110-
NSString *title = \
111-
[NSString stringWithFormat:@"Failed with error %d", (int)[error code]];
112-
UIAlertController *alertController = \
113-
[UIAlertController alertControllerWithTitle:title
114-
message:[error localizedDescription]
115-
preferredStyle:UIAlertControllerStyleAlert];
116-
UIAlertAction *dismiss = \
117-
[UIAlertAction actionWithTitle:@"Dismiss"
118-
style:UIAlertActionStyleDefault
119-
handler:nil];
120-
[alertController addAction:dismiss];
121-
[self presentViewController:alertController
122-
animated:YES
123-
completion:nil];
124-
=======
125109
NSString *title = [NSString stringWithFormat:@"Failed with error %d", (int)[error code]];
126110
UIAlertController *alertController =
127111
[UIAlertController alertControllerWithTitle:title
@@ -131,7 +115,6 @@ - (void)setupAVCapture {
131115
[UIAlertAction actionWithTitle:@"Dismiss" style:UIAlertActionStyleDefault handler:nil];
132116
[alertController addAction:dismiss];
133117
[self presentViewController:alertController animated:YES completion:nil];
134-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
135118
[self teardownAVCapture];
136119
}
137120
}

‎tensorflow/contrib/layers/python/layers/layers.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -359,28 +359,6 @@ def _delay_updates():
359359

360360

361361
@add_arg_scope
362-
<<<<<<< HEAD
363-
def batch_norm(
364-
inputs,
365-
decay=0.999,
366-
center=True,
367-
scale=False,
368-
epsilon=0.001,
369-
activation_fn=None,
370-
param_initializers=None,
371-
param_regularizers=None,
372-
updates_collections=ops.GraphKeys.UPDATE_OPS,
373-
is_training=True,
374-
reuse=None,
375-
variables_collections=None,
376-
outputs_collections=None,
377-
trainable=True,
378-
batch_weights=None,
379-
fused=False,
380-
data_format=DATA_FORMAT_NHWC,
381-
zero_debias_moving_mean=False,
382-
scope=None):
383-
=======
384362
def batch_norm(inputs,
385363
decay=0.999,
386364
center=True,
@@ -400,7 +378,6 @@ def batch_norm(inputs,
400378
data_format=DATA_FORMAT_NHWC,
401379
zero_debias_moving_mean=False,
402380
scope=None):
403-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
404381
"""Adds a Batch Normalization layer from http://arxiv.org/abs/1502.03167.
405382
406383
"Batch Normalization: Accelerating Deep Network Training by Reducing

‎tensorflow/contrib/layers/python/layers/layers_test.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,12 +1682,8 @@ def testWeightedMomentsFused(self):
16821682
def testParamRegularizersFused(self):
16831683
with ops.Graph().as_default() as g, self.test_session(g):
16841684
inputs = array_ops.placeholder(dtype=dtypes.float32, shape=(5, 3, 3, 7))
1685-
<<<<<<< HEAD
1686-
with self.assertRaisesRegexp(ValueError, 'Regularizers are not currently'):
1687-
=======
16881685
with self.assertRaisesRegexp(ValueError,
16891686
'Regularizers are not currently'):
1690-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
16911687
_layers.batch_norm(inputs, param_regularizers={}, fused=True)
16921688

16931689
def _testCreateOp(self, fused):
@@ -1717,35 +1713,19 @@ def testCreateOpBetaRegularizer(self):
17171713
self.assertEqual(
17181714
len(ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)), 1)
17191715
beta_decay = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)[0]
1720-
<<<<<<< HEAD
1721-
self.assertEqual(
1722-
beta_decay.op.name,
1723-
'BatchNorm/beta/Regularizer/mul')
1724-
=======
17251716
self.assertEqual(beta_decay.op.name, 'BatchNorm/beta/Regularizer/mul')
1726-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
17271717

17281718
def testCreateOpGammaRegularizer(self):
17291719
height, width = 3, 3
17301720
with self.test_session():
17311721
reg = lambda x: 0.1 * math_ops.reduce_sum(x)
17321722
images = np.random.uniform(size=(5, height, width, 3)).astype('f')
17331723
output = _layers.batch_norm(
1734-
<<<<<<< HEAD
1735-
images, param_regularizers={'gamma': reg}, scale=True)
1736-
self.assertEqual(
1737-
len(ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)), 1)
1738-
gamma_decay = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)[0]
1739-
self.assertEqual(
1740-
gamma_decay.op.name,
1741-
'BatchNorm/gamma/Regularizer/mul')
1742-
=======
17431724
images, param_regularizers={'gamma': reg}, scale=True)
17441725
self.assertEqual(
17451726
len(ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)), 1)
17461727
gamma_decay = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)[0]
17471728
self.assertEqual(gamma_decay.op.name, 'BatchNorm/gamma/Regularizer/mul')
1748-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
17491729

17501730
def testCreateVariables(self):
17511731
height, width = 3, 3

‎tensorflow/contrib/learn/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
@@LogisticRegressor
4040
@@SVM
4141
@@SKCompat
42-
<<<<<<< HEAD
43-
=======
4442
4543
@@Head
4644
@@multi_class_head
@@ -50,7 +48,6 @@
5048
@@poisson_regression_head
5149
@@multi_head
5250
@@no_op_train_fn
53-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
5451
5552
@@Experiment
5653
@@ExportStrategy

‎tensorflow/core/BUILD

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -761,13 +761,8 @@ cc_library(
761761
"//tensorflow/core/kernels:constant_op",
762762
"//tensorflow/core/kernels:ops_testutil",
763763
"//tensorflow/core/kernels:ops_util",
764-
<<<<<<< HEAD
765764
"//tensorflow/core/platform/default/build_config:gtest",
766765
] + if_sycl([":sycl_runtime"]),
767-
=======
768-
"//tensorflow/core/platform/default/build_config:gtest", # + if_sycl([":sycl_runtime"]),
769-
],
770-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
771766
)
772767

773768
# This is a link-only library to provide a DirectSession

‎tensorflow/core/kernels/eigen_pooling.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -330,32 +330,19 @@ struct AvgPoolMeanReducer {
330330

331331
#if (EIGEN_ARCH_i386 || EIGEN_ARCH_x86_64) && !defined(__CUDACC__)
332332
#ifdef EIGEN_VECTORIZE_AVX512
333-
<<<<<<< HEAD
334-
#define pequal(a, b) \
335-
_mm512_castsi512_ps(_mm512_maskz_set1_epi32(_mm512_cmp_ps_mask(a, b, _CMP_EQ_UQ), -1))
336-
337-
=======
338333
#define pequal(a, b) \
339334
_mm512_castsi512_ps( \
340335
_mm512_maskz_set1_epi32(_mm512_cmp_ps_mask(a, b, _CMP_EQ_UQ), -1))
341336

342-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
343337
// The ternarylogic function immediate determines the values in the result
344338
// In the case below, 0xd8 implies (false_mask) ? (b) : (a)
345339
// For details, refer to the vpternlogd instruction table at
346340
// http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-vol-2c-manual.pdf
347-
<<<<<<< HEAD
348-
#define psel(a, b, false_mask) \
349-
_mm512_castsi512_ps(_mm512_ternarylogic_epi32(_mm512_castps_si512(a), \
350-
_mm512_castps_si512(b), \
351-
_mm512_castps_si512(false_mask), \
352-
0xd8))
353-
=======
341+
354342
#define psel(a, b, false_mask) \
355343
_mm512_castsi512_ps(_mm512_ternarylogic_epi32( \
356344
_mm512_castps_si512(a), _mm512_castps_si512(b), \
357345
_mm512_castps_si512(false_mask), 0xd8))
358-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
359346
#elif defined EIGEN_VECTORIZE_AVX
360347
#define pequal(a, b) _mm256_cmp_ps(a, b, _CMP_EQ_UQ)
361348
#define psel(a, b, false_mask) _mm256_blendv_ps(a, b, false_mask)

‎tensorflow/core/kernels/sparse_matmul_op.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,8 @@ EIGEN_STRONG_INLINE Packet8d pbroadcast_third<Packet8d>(const Packet8d& a_in) {
260260
}
261261
template <>
262262
EIGEN_STRONG_INLINE Packet8d pbroadcast_fourth<Packet8d>(const Packet8d& a_in) {
263-
<<<<<<< HEAD
264-
Packet2d a = _mm_permute_pd(_mm256_extractf128_pd(_mm512_castpd512_pd256(a_in), 1), 3);
265-
=======
266263
Packet2d a =
267264
_mm_permute_pd(_mm256_extractf128_pd(_mm512_castpd512_pd256(a_in), 1), 3);
268-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
269265
return _mm512_broadcastsd_pd(a);
270266
}
271267
template <>
@@ -422,27 +418,17 @@ EIGEN_STRONG_INLINE Packet8f pbroadcast_fourth<Packet8f>(const Packet8f& a) {
422418

423419
template <typename Packet>
424420
EIGEN_DEVICE_FUNC inline Packet16f pexpand_bf16_l(const Packet16f& from) {
425-
<<<<<<< HEAD
426-
return _mm512_castsi512_ps(_mm512_slli_epi32(_mm512_cvtepu16_epi32(_mm512_castsi512_si256(_mm512_castps_si512(from))),
427-
16));
428-
=======
429421
return _mm512_castsi512_ps(_mm512_slli_epi32(
430422
_mm512_cvtepu16_epi32(_mm512_castsi512_si256(_mm512_castps_si512(from))),
431423
16));
432-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
433424
}
434425

435426
template <typename Packet>
436427
EIGEN_DEVICE_FUNC inline Packet16f pexpand_bf16_u(const Packet16f& from) {
437-
<<<<<<< HEAD
438-
return _mm512_castsi512_ps(_mm512_slli_epi32(
439-
_mm512_cvtepu16_epi32(_mm256_castpd_si256(_mm512_extractf64x4_pd(_mm512_castps_pd(from), 1))), 16));
440-
=======
441428
return _mm512_castsi512_ps(
442429
_mm512_slli_epi32(_mm512_cvtepu16_epi32(_mm256_castpd_si256(
443430
_mm512_extractf64x4_pd(_mm512_castps_pd(from), 1))),
444431
16));
445-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
446432
}
447433

448434
#endif

‎tensorflow/java/src/main/native/saved_model_bundle_jni.cc

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,9 @@ limitations under the License.
2020
#include "tensorflow/java/src/main/native/exception_jni.h"
2121
#include "tensorflow/java/src/main/native/saved_model_bundle_jni.h"
2222

23-
<<<<<<< HEAD
24-
JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(JNIEnv * env,
25-
jclass clazz,
26-
jstring export_dir,
27-
jobjectArray tags,
28-
jbyteArray run_options) {
29-
30-
=======
3123
JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(
3224
JNIEnv* env, jclass clazz, jstring export_dir, jobjectArray tags,
3325
jbyteArray run_options) {
34-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
3526
TF_Status* status = TF_NewStatus();
3627
jobject bundle = nullptr;
3728

@@ -42,12 +33,8 @@ JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(
4233
size_t sz = env->GetArrayLength(run_options);
4334
if (sz > 0) {
4435
jbyte* run_options_data = env->GetByteArrayElements(run_options, nullptr);
45-
<<<<<<< HEAD
46-
crun_options = TF_NewBufferFromString(static_cast<void*>(run_options_data), sz);
47-
=======
4836
crun_options =
4937
TF_NewBufferFromString(static_cast<void*>(run_options_data), sz);
50-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
5138
env->ReleaseByteArrayElements(run_options, run_options_data, JNI_ABORT);
5239
}
5340
}
@@ -64,23 +51,13 @@ JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(
6451
// load the session
6552
TF_Graph* graph = TF_NewGraph();
6653
TF_Buffer* metagraph_def = TF_NewBuffer();
67-
<<<<<<< HEAD
68-
TF_Session* session = TF_LoadSessionFromSavedModel(opts, crun_options, cexport_dir,
69-
tags_ptrs.get(), tags_len, graph,
70-
metagraph_def, status);
71-
72-
// release the parameters
73-
TF_DeleteSessionOptions(opts);
74-
if(crun_options != nullptr) {
75-
=======
7654
TF_Session* session = TF_LoadSessionFromSavedModel(
7755
opts, crun_options, cexport_dir, tags_ptrs.get(), tags_len, graph,
7856
metagraph_def, status);
7957

8058
// release the parameters
8159
TF_DeleteSessionOptions(opts);
8260
if (crun_options != nullptr) {
83-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
8461
TF_DeleteBuffer(crun_options);
8562
}
8663
env->ReleaseStringUTFChars(export_dir, cexport_dir);
@@ -94,29 +71,6 @@ JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(
9471
if (throwExceptionIfNotOK(env, status)) {
9572
// sizeof(jsize) is less than sizeof(size_t) on some platforms.
9673
if (metagraph_def->length > std::numeric_limits<jint>::max()) {
97-
<<<<<<< HEAD
98-
throwException(env, kIndexOutOfBoundsException,
99-
"MetaGraphDef is too large to serialize into a byte[] array");
100-
} else {
101-
static_assert(sizeof(jbyte) == 1, "unexpected size of the jbyte type");
102-
jint jmetagraph_len = static_cast<jint>(metagraph_def->length);
103-
jbyteArray jmetagraph_def = env->NewByteArray(jmetagraph_len);
104-
env->SetByteArrayRegion(jmetagraph_def, 0, jmetagraph_len,
105-
static_cast<const jbyte*>(metagraph_def->data));
106-
107-
jmethodID method = env->GetStaticMethodID(clazz, "fromHandle", "(JJ[B)Lorg/tensorflow/SavedModelBundle;");
108-
bundle = env->CallStaticObjectMethod(clazz, method,
109-
reinterpret_cast<jlong>(graph),
110-
reinterpret_cast<jlong>(session),
111-
jmetagraph_def);
112-
graph = nullptr;
113-
session = nullptr;
114-
env->DeleteLocalRef(jmetagraph_def);
115-
}
116-
}
117-
118-
if(session != nullptr) {
119-
=======
12074
throwException(
12175
env, kIndexOutOfBoundsException,
12276
"MetaGraphDef is too large to serialize into a byte[] array");
@@ -139,16 +93,11 @@ JNIEXPORT jobject JNICALL Java_org_tensorflow_SavedModelBundle_load(
13993
}
14094

14195
if (session != nullptr) {
142-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
14396
TF_CloseSession(session, status);
14497
// Result of close is ignored, delete anyway.
14598
TF_DeleteSession(session, status);
14699
}
147-
<<<<<<< HEAD
148-
if(graph != nullptr) {
149-
=======
150100
if (graph != nullptr) {
151-
>>>>>>> eb8bb9e461f669f299aa031634530995bc43f92b
152101
TF_DeleteGraph(graph);
153102
}
154103
TF_DeleteBuffer(metagraph_def);

0 commit comments

Comments
 (0)