search

lhelontra / tensorflow-on-arm

TensorFlow for Arm
MIT License
1.05k stars 274 forks source link

patch.sh corrupt? #51

Closed sseiber closed 5 years ago

sseiber commented 5 years ago

When I look at the ./build_tensorflow/patch.sh file it contains what looks like merge conflicts. Is this correct or is the file somehow corrupt from a previous merge?

For example at line 29 I see:

  local CROSSTOOL_VERSION=$($CROSSTOOL_DIR/bin/$CROSSTOOL_NAME-gcc -dumpversion)
  git apply << EOF
diff --git a/BUILD.local_arm_compiler b/BUILD.local_arm_compiler
new file mode 100644
index 000000000..e5d8cc384
+++ b/BUILD.local_arm_compiler
@@ -0,0 +1,81 @@
+package(default_visibility = ['//visibility:public'])
+

The rest of the file contains more merge annotations like this. I have looked at the file history and all the previous files contain this as well.

sseiber commented 5 years ago

I see this is a patch (git apply) which is inline. The patch process is failing during my build so I'll look into that issue.