[arch-commits] Commit in tensorflow/trunk (4 files)

Konstantin Gizdov kgizdov at archlinux.org
Thu Jun 27 10:21:05 UTC 2019


    Date: Thursday, June 27, 2019 @ 10:21:04
  Author: kgizdov
Revision: 484889

remove unneeded files

Modified:
  tensorflow/trunk/PKGBUILD
Deleted:
  tensorflow/trunk/cuda_config.patch
  tensorflow/trunk/protobuf_temp_fix_cuda10.1.patch
  tensorflow/trunk/protobuf_temp_fix_cuda10.1_apply.patch

----------------------------------------+
 PKGBUILD                               |    2 
 cuda_config.patch                      |   70 -------------------------------
 protobuf_temp_fix_cuda10.1.patch       |   35 ---------------
 protobuf_temp_fix_cuda10.1_apply.patch |   44 -------------------
 4 files changed, 1 insertion(+), 150 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-27 10:13:09 UTC (rev 484888)
+++ PKGBUILD	2019-06-27 10:21:04 UTC (rev 484889)
@@ -7,7 +7,7 @@
 pkgname=(tensorflow tensorflow-opt tensorflow-cuda tensorflow-opt-cuda python-tensorflow python-tensorflow-opt python-tensorflow-cuda python-tensorflow-opt-cuda)
 pkgver=1.14.0
 _pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for computation using data flow graphs for scalable machine learning"
 url="https://www.tensorflow.org/"
 license=('APACHE')

Deleted: cuda_config.patch
===================================================================
--- cuda_config.patch	2019-06-27 10:13:09 UTC (rev 484888)
+++ cuda_config.patch	2019-06-27 10:21:04 UTC (rev 484889)
@@ -1,70 +0,0 @@
-diff --git a/tensorflow/stream_executor/dso_loader.cc b/tensorflow/stream_executor/dso_loader.cc
-index 6dda5d6315..4df1d0dcfc 100644
---- a/tensorflow/stream_executor/dso_loader.cc
-+++ b/tensorflow/stream_executor/dso_loader.cc
-@@ -46,7 +46,7 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
- 
- /* static */ port::Status DsoLoader::GetCublasDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "cublas", GetCudaVersion()),
-+                                      "cublas", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
-@@ -63,14 +63,14 @@ string GetCudnnVersion() { return TF_CUDNN_VERSION; }
- 
- /* static */ port::Status DsoLoader::GetCufftDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "cufft", GetCudaVersion()),
-+                                      "cufft", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
- 
- /* static */ port::Status DsoLoader::GetCurandDsoHandle(void** dso_handle) {
-   return GetDsoHandle(FindDsoPath(port::Env::Default()->FormatLibraryFileName(
--                                      "curand", GetCudaVersion()),
-+                                      "curand", "10"),
-                                   GetCudaLibraryDirPath()),
-                       dso_handle);
- }
-diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
-index 8aa5b89cdd..7ed4bb8b45 100644
---- a/third_party/gpus/cuda_configure.bzl
-+++ b/third_party/gpus/cuda_configure.bzl
-@@ -842,7 +842,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cusolver":
-           _find_cuda_lib(
-@@ -850,7 +850,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "curand":
-           _find_cuda_lib(
-@@ -858,7 +858,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cufft":
-           _find_cuda_lib(
-@@ -866,7 +866,7 @@ def _find_libs(repository_ctx, cuda_config):
-               repository_ctx,
-               cpu_value,
-               cuda_config.cuda_toolkit_path,
--              cuda_config.cuda_version,
-+              '',
-           ),
-       "cudnn":
-           _find_cuda_lib(

Deleted: protobuf_temp_fix_cuda10.1.patch
===================================================================
--- protobuf_temp_fix_cuda10.1.patch	2019-06-27 10:13:09 UTC (rev 484888)
+++ protobuf_temp_fix_cuda10.1.patch	2019-06-27 10:21:04 UTC (rev 484889)
@@ -1,35 +0,0 @@
-diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
-index 40f35e92..1af91f9c 100644
---- a/src/google/protobuf/map.h
-+++ b/src/google/protobuf/map.h
-@@ -425,10 +425,10 @@ class Map {
-         node_ = NULL;
-         for (bucket_index_ = start_bucket; bucket_index_ < m_->num_buckets_;
-              bucket_index_++) {
--          if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-+          if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
-             node_ = static_cast<Node*>(m_->table_[bucket_index_]);
-             break;
--          } else if (m_->TableEntryIsTree(bucket_index_)) {
-+          } else if ((*m_).TableEntryIsTree(bucket_index_)) {
-             Tree* tree = static_cast<Tree*>(m_->table_[bucket_index_]);
-             GOOGLE_DCHECK(!tree->empty());
-             node_ = NodePtrFromKeyPtr(*tree->begin());
-@@ -487,7 +487,7 @@ class Map {
-           return true;
-         // Less common: the bucket is a linked list with node_ somewhere in it,
-         // but not at the head.
--        if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-+        if ((*m_).TableEntryIsNonEmptyList(bucket_index_)) {
-           Node* l = static_cast<Node*>(m_->table_[bucket_index_]);
-           while ((l = l->next) != NULL) {
-             if (l == node_) {
-@@ -501,7 +501,7 @@ class Map {
-         // find-like method that compares Node* instead of const Key&.
-         iterator_base i(m_->find(*KeyPtrFromNodePtr(node_), it));
-         bucket_index_ = i.bucket_index_;
--        return m_->TableEntryIsList(bucket_index_);
-+        return (*m_).TableEntryIsList(bucket_index_);
-       }
- 
-       Node* node_;

Deleted: protobuf_temp_fix_cuda10.1_apply.patch
===================================================================
--- protobuf_temp_fix_cuda10.1_apply.patch	2019-06-27 10:13:09 UTC (rev 484888)
+++ protobuf_temp_fix_cuda10.1_apply.patch	2019-06-27 10:21:04 UTC (rev 484889)
@@ -1,44 +0,0 @@
-diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
-index dff151246a..d3fe95ec04 100755
---- a/tensorflow/workspace.bzl
-+++ b/tensorflow/workspace.bzl
-@@ -349,11 +349,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-     )
- 
-     PROTOBUF_URLS = [
--        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
--        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.2.tar.gz",
-+        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
-+        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.3.tar.gz",
-     ]
--    PROTOBUF_SHA256 = "2244b0308846bb22b4ff0bcc675e99290ff9f1115553ae9671eba1030af31bc0"
--    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.2"
-+    PROTOBUF_SHA256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a"
-+    PROTOBUF_STRIP_PREFIX = "protobuf-3.6.1.3"
- 
-     tf_http_archive(
-         name = "protobuf_archive",
-@@ -364,6 +364,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     # We need to import the protobuf library under the names com_google_protobuf
-@@ -378,6 +379,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     tf_http_archive(
-@@ -389,6 +391,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-             "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
-         },
-         urls = PROTOBUF_URLS,
-+        patch_file = clean_dep("//third_party:protobuf_temp_fix_cuda10.1.patch"),
-     )
- 
-     tf_http_archive(



More information about the arch-commits mailing list