Skip to content

Commit

Permalink
Merge pull request #42902 from winstondu/r1.15
Browse files Browse the repository at this point in the history
Fix 1.15 build and run issues on iOS
  • Loading branch information
mihaimaruseac committed Sep 18, 2020
2 parents ddb20ee + 9784058 commit 4cbc7d6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tensorflow/contrib/makefile/download_dependencies.sh
Expand Up @@ -26,7 +26,7 @@ if [ ! -f $BZL_FILE_PATH ]; then
exit 1;
fi

EIGEN_URL="$(grep -o 'https://bitbucket.org/eigen/eigen/get/.*tar\.gz' "${BZL_FILE_PATH}" | grep -v mirror.bazel | head -n1)"
EIGEN_URL="$(grep -o 'https://storage.googleapis.com/mirror.tensorflow.org/bitbucket.org/eigen/eigen/get/.*tar.gz' "${BZL_FILE_PATH}")"
GEMMLOWP_URL="$(grep -o 'https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/gemmlowp/.*zip' "${BZL_FILE_PATH}" | head -n1)"
GOOGLETEST_URL="https://github.com/google/googletest/archive/release-1.8.0.tar.gz"
NSYNC_URL="$(grep -o 'https://storage.googleapis.com/mirror.tensorflow.org/github.com/google/nsync/.*tar\.gz' "${BZL_FILE_PATH}" | head -n1)"
Expand Down
4 changes: 4 additions & 0 deletions tensorflow/core/platform/profile_utils/cpu_utils.h
Expand Up @@ -67,6 +67,10 @@ class CpuUtils {
__asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
return (high << 32) | low;
// ----------------------------------------------------------------
#elif defined(__aarch64__) && defined(TARGET_OS_IOS)
// On iOS, we are not able to access the cntvct_el0 register.
// As a temporary build fix, we will just return the dummy cycle clock.
return DUMMY_CYCLE_CLOCK
#elif defined(__aarch64__)
// System timer of ARMv8 runs at a different frequency than the CPU's.
// The frequency is fixed, typically in the range 1-50MHz. It can because
Expand Down

0 comments on commit 4cbc7d6

Please sign in to comment.