1 files changed, 91 insertions, 19 deletions

diff --git a/guix-science/packages/python.scm b/guix-science/packages/python.scm
index 208c194..7dd42ad 100644
--- a/guix-science/packages/python.scm
+++ b/guix-science/packages/python.scm
@@ -54,6 +54,7 @@
   #:use-module (guix search-paths)
   #:use-module (guix utils)
   #:use-module (guix-science build-system bazel)
+  #:use-module (guix-science packages bazel)
   #:use-module (guix-science packages machine-learning)
   #:use-module (guix-science packages python-xyz)
   #:use-module (guix-science packages serialization)
@@ -485,7 +486,7 @@ differentiable optimizers in JAX.
    ;;"astunparse_archive"
    ;;"boringssl"
    ;;"com_github_googlecloudplatform_google_cloud_cpp"
-   "com_github_grpc_grpc"
+   ;;"com_github_grpc_grpc"
    ;;"com_google_absl"
    ;;"com_google_protobuf"
    ;;"com_googlesource_code_re2"
@@ -493,7 +494,7 @@ differentiable optimizers in JAX.
    "cython"
    ;;"dill_archive"
    "double_conversion"
-   "flatbuffers"
+   ;;"flatbuffers"
    ;;"functools32_archive"
    "gast_archive"
    "gif"
@@ -503,11 +504,10 @@ differentiable optimizers in JAX.
    "libjpeg_turbo"
    "nasm"
    "nsync"
-   "opt_einsum_archive"
    ;;"org_sqlite"
    "pasta"
    "png"
-   ;;"pybind11" ;Our 2.8.1 does not support "const_name" attribute
+   ;;"pybind11"
    "six_archive"
    ;;"snappy"
    ;;"tblib_archive"
@@ -573,7 +573,7 @@ mechanism for serializing structured data.")
 (define-public tensorflow
   (package
     (name "tensorflow")
-    (version "2.13.1")
+    (version "2.18.1")
     (source
      (origin
        (method git-fetch)
@@ -582,11 +582,73 @@ mechanism for serializing structured data.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "09mfskmpvpbq919wibnw3bnhi1y3hkx3qrzm72gdr0gsivn1yb3w"))))
+        (base32 "0swxxjd1c77jzym22d4azb1rf55b2gzn79653za7n63mqxdimpng"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (let ((generator
+                  (lambda _
+                    (display "\
+--- a/python/repositories.bzl
++++ b/python/repositories.bzl
+@@ -218,7 +218,7 @@
+                 else:
+                     fail(\"The current user has CAP_DAC_OVERRIDE set, please drop this capability when using the hermetic Python interpreter. See https://github.com/bazelbuild/rules_python/pull/713.\")
+ 
+-    python_bin = \"python.exe\" if (\"windows\" in platform) else \"bin/python3\"
++    python_bin = \"python.exe\" if (\"windows\" in platform) else rctx.os.environ.get(\"GUIX_PYTHON_PREFIX_DIR\")
+ 
+     glob_include = []
+     glob_exclude = [
+@@ -359,7 +359,7 @@
+     }}),
+ )
+ 
+-exports_files([\"python\", \"{python_path}\"])
++exports_files([\"python\", \"bin/python\"])
+ 
+ # Used to only download coverage toolchain when the coverage is collected by
+ # bazel.
+@@ -373,7 +373,7 @@
+     name = \"py3_runtime\",
+     files = [\":files\"],
+ {coverage_attr}
+-    interpreter = \"{python_path}\",
++    interpreter = \"bin/python\",
+     interpreter_version_info = {{
+         \"major\": \"{interpreter_version_info_major}\",
+         \"minor\": \"{interpreter_version_info_minor}\",
+@@ -413,7 +413,12 @@
+         interpreter_version_info_micro = python_version_info[2],
+     )
+     rctx.delete(\"python\")
+-    rctx.symlink(python_bin, \"python\")
++    rctx.delete(\"bin\")
++    rctx.delete(\"lib\")
++    rctx.symlink(python_bin + \"/bin/python\", \"bin/python\")
++    rctx.symlink(python_bin + \"/bin/python\", \"bin/python3\")
++    rctx.symlink(python_bin + \"/lib\", \"lib\")
++
+     rctx.file(STANDALONE_INTERPRETER_FILENAME, \"# File intentionally left blank. Indicates that this is an interpreter repo created by rules_python.\")
+     rctx.file(\"BUILD.bazel\", build_content)
+ "))))
+             (with-output-to-file "third_party/py/guix_python.patch"
+               generator)
+             (with-output-to-file "third_party/xla/third_party/py/guix_python.patch"
+               generator))
+           (substitute* '("third_party/py/python_init_rules.bzl"
+                          "third_party/xla/third_party/py/python_init_rules.bzl")
+             (("patches = \\[Label\\(\"//third_party/py:rules_python.patch\"\\)\\],")
+              "patches = [
+Label(\"//third_party/py:guix_python.patch\"),
+Label(\"//third_party/py:rules_python.patch\")
+],
+"))))))
     (build-system bazel-build-system)
     (arguments
      (list
       #:tests? #false                   ;there are none
+      #:bazel bazel-6.5
       #:bazel-configuration
       ;; TODO: is the union build *really* necessary?
       (with-imported-modules (source-module-closure '((guix build utils)
@@ -596,25 +658,32 @@ mechanism for serializing structured data.")
             (use-modules (guix build union))
             (union-build (string-append (getenv "NIX_BUILD_TOP") "/site-packages")
                          (parse-path (getenv "GUIX_PYTHONPATH")))
+            (setenv "RULES_PYTHON_REPO_DEBUG" "1")
             (setenv "PYTHON_LIB_PATH" (string-append (getenv "NIX_BUILD_TOP") "/site-packages"))
             (setenv "PYTHON_BIN_PATH"
                     (string-append
                      #$(this-package-input "python-wrapper")
                      "/bin/python"))
+            (setenv "GUIX_PYTHON_PREFIX_DIR"
+                    #$(this-package-input "python-wrapper"))
             (setenv "TF_PYTHON_VERSION"
                     #$(version-major+minor
                        (package-version (this-package-input "python-wrapper"))))
             (setenv "TF_SYSTEM_LIBS"
                     (string-join '#$tensorflow-system-libs ","))))
       #:fetch-targets
-      '(list "//tensorflow/tools/pip_package:build_pip_package"
+      '(list "//tensorflow/tools/pip_package:wheel"
              "//tensorflow/tools/lib_package:libtensorflow")
       #:build-targets
-      '(list "//tensorflow/tools/pip_package:build_pip_package"
+      '(list "//tensorflow/tools/pip_package:wheel"
              "//tensorflow/tools/lib_package:libtensorflow")
       #:bazel-arguments
       #~(list
          "--extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain_nonstrict"
+         ;; We need a more recent version of platforms, because the
+         ;; included cpu package does not define cpu:wasm32.
+         (string-append "--override_repository=platforms="
+                        #$(this-package-native-input "bazel-platforms-0.0.8-checkout"))
          "--action_env=PYTHON_LIB_PATH"
          "--host_action_env=PYTHON_LIB_PATH"
          "--action_env=PYTHON_BIN_PATH"
@@ -623,21 +692,16 @@ mechanism for serializing structured data.")
                         #$(this-package-input "python-wrapper")
                         "/bin/python"))
       #:vendored-inputs-hash
-      "0bqlwf9br68mrm5ambnm3dg31gnpsa12wfm2q2gqszknhmk1nyj8"
+      "1gqaiq1800v895kxppi5z8nzagk4fbpc8vwq33466kh06m25yy6c"
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack-vendored-inputs 'configure
             (lambda _
               (define bazel-out
                 (string-append (getenv "NIX_BUILD_TOP") "/output"))
-              ;; XXX: Our version of protobuf leads to "File already
-              ;; exists in database" when loading in Python.
-              (substitute* (string-append bazel-out "/external/tf_runtime/third_party/systemlibs/protobuf.BUILD")
-                (("-lprotobuf") "-l:libprotobuf.a")
-                (("-lprotoc") "-l:libprotoc.a"))
               ;; Do not mess with RUNPATH
-              (substitute* "tensorflow/tools/pip_package/build_pip_package.sh"
-                (("patchelf ") "echo -- "))
+              (substitute* "tensorflow/tools/pip_package/build_pip_package.py"
+                (("\"patchelf\", ") "\"echo\", \"--\", "))
               (setenv "BAZEL_USE_CPP_ONLY_TOOLCHAIN" "1")
               (setenv "USER" "homeless-shelter")
               (setenv "TF_SYSTEM_LIBS"
@@ -666,10 +730,10 @@ Cflags: -I~a/include/tensorflow
               ;; Install python bindings
               ;; Build the source code, then copy it to the "python" output.
               ;;
-              ;; TODO: build_pip_package includes symlinks so we must
+              ;; TODO: build_pip_package.py includes symlinks so we must
               ;; dereference them.
               (let ((here (string-append (getcwd) "/dist")))
-                (invoke "bazel-bin/tensorflow/tools/pip_package/build_pip_package"
+                (invoke "python3" "bazel-bin/tensorflow/tools/pip_package/build_pip_package.py"
                         "--src" here)
                 (copy-recursively here #$output:python)))))))
     (outputs '("out" "python"))
@@ -740,7 +804,15 @@ Cflags: -I~a/include/tensorflow
      (list perl
            python-lit
            python-pypa-build
-           python-setuptools))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                    (url "https://github.com/bazelbuild/platforms")
+                    (commit "0.0.8")))
+             (file-name (git-file-name "bazel-platforms" "0.0.8"))
+             (sha256
+              (base32
+               "1wx2348w49vxr3z9kjfls5zsrwr0div6r3irbvdlawan87sx5yfs")))))
     (home-page "https://tensorflow.org")
     (synopsis "Machine learning framework")
     (description "TensorFlow is a flexible platform for building and