numpy: Use custom-packaged version of NumPy

Author: EricCousineau-TRI

bindings/pydrake/BUILD.bazel

@@ -42,6 +42,7 @@ drake_pybind_library(
     package_info = PACKAGE_INFO,
     py_deps = [
         "//bindings/pydrake/util:deprecation_py",
+        "@numpy_py",
     ],
     py_srcs = [
         "__init__.py",

bindings/pydrake/third_party/BUILD.bazel

@@ -71,6 +71,9 @@ install(
     py_dest = PACKAGE_INFO.py_dest,
     docs = ["wrapt/LICENSE"],
     doc_dest = "share/doc",
+    deps = [
+        "@numpy_py//:install",
+    ],
 )
 
 add_lint_tests()

tools/workspace/default.bzl

@@ -143,8 +143,8 @@ def add_default_repositories(excludes = [], mirrors = DEFAULT_MIRRORS):
         net_sf_jchart2d_repository(name = "net_sf_jchart2d", mirrors = mirrors)
     if "nlopt" not in excludes:
         nlopt_repository(name = "nlopt")
-    if "numpy" not in excludes:
-        numpy_repository(name = "numpy")
+    if "numpy_py" not in excludes:
+        numpy_repository(name = "numpy_py")
     if "octomap" not in excludes:
         octomap_repository(name = "octomap", mirrors = mirrors)
     if "optitrack_driver" not in excludes:

tools/workspace/numpy/BUILD.bazel

@@ -4,5 +4,12 @@
 # neighboring *.bzl file can be loaded elsewhere.
 
 load("//tools/lint:lint.bzl", "add_lint_tests")
+load("//tools/skylark:drake_py.bzl", "drake_py_test")
+
+drake_py_test(
+    name = "numpy_test",
+    allow_import_unittest = True,
+    deps = ["@numpy_py"],
+)
 
 add_lint_tests()

tools/workspace/numpy/repository.bzl

@@ -2,69 +2,101 @@
 # vi: set ft=python :
 
 """
-Finds local system NumPy headers and makes them available to be used as a
-C/C++ dependency.
+Provides NumPy from a wheel file.
 
 Example:
     WORKSPACE:
         load("@drake//tools/workspace/numpy:repo.bzl", "numpy_repository")
         numpy_repository(
             name = "foo",
-            python_version = "2",
         )
 
     BUILD:
-        cc_library(
+        py_library(
             name = "foobar",
             deps = ["@foo//:numpy"],
-            srcs = ["bar.cc"],
+            srcs = ["bar.py"],
         )
 
 Arguments:
     name: A unique name for this rule.
-    python_version: The major or major.minor version of Python for which NumPy
-                    headers are to be found.
 """
 
-load("@drake//tools/workspace:execute.bzl", "which")
+load("@drake//tools/workspace:os.bzl", "determine_os")
+
+# Generated from Git revision 7d247f4 from numpy/numpy#10898.
+# See `./packaging/README.md` for instructions to generate these binaries.
+# PR DRAFT(eric.cousineau): Upload these to S3 or when they pass review.
+wheels = {
+    "ubuntu_16.04": {
+        "url": "https://github.com/EricCousineau-TRI/experimental/raw/e84664659a7ceeac016f626b4d77f5a89c4cad62/numpy/numpy-1.15.0.dev0%2B7d247f4-cp27-cp27mu-linux_x86_64.whl",  # noqa
+        "sha256": "643f7e11c5f0213ae171d91e5759da51e4f39a0a9ba912f42189b3004507c21c",  # noqa
+    },
+    "mac": {
+        "url": "https://github.com/EricCousineau-TRI/experimental/raw/3211d6dd6aee9e8dd70a19ef86b961a2de3bf821/numpy/numpy-1.15.0.dev0%2B7d247f4-cp27-cp27m-macosx_10_13_x86_64.whl",  # noqa
+        "sha256": "1b3cee66ff92e2e0dc1c97d167b5b13873c3e97a87829a1c7830964ab48b2648",  # noqa
+    },
+}
 
 def _impl(repository_ctx):
-    python = which(repository_ctx, "python{}".format(
-        repository_ctx.attr.python_version))
-
-    if not python:
-        fail("Could NOT find python{}".format(repository_ctx.attr.version))
-
-    result = repository_ctx.execute([
-        python,
-        "-c",
-        "; ".join([
-            "from __future__ import print_function",
-            "import numpy",
-            "print(numpy.get_include())",
-        ]),
-    ])
-
-    if result.return_code != 0:
-        fail("Could NOT determine NumPy include", attr = result.stderr)
-
-    source = repository_ctx.path(result.stdout.strip())
-    destination = repository_ctx.path("include")
-    repository_ctx.symlink(source, destination)
+    # Do not name this `numpy`, as Bazel will confuse `PYTHONPATH`:
+    # If `numpy` is located in the repo root, `random` will be shadowed by
+    # `numpy.random`, causing everything to fail.
+    # If installed elsewhere, Bazel will put an autogenerated `__init__.py` at
+    # external directory's root, leak the wrong path, and shadow the real
+    # `numpy`. See https://github.com/bazelbuild/bazel/issues/3998
+    if repository_ctx.name == "numpy":
+        fail("Do not name this repository `numpy`. Please name it " +
+             "`numpy_py` or something else.")
+
+    os_result = determine_os(repository_ctx)
+    if os_result.error != None:
+        fail(os_result.error)
+
+    wheel = None
+    if os_result.is_macos:
+        wheel = wheels["mac"]
+    elif os_result.is_ubuntu:
+        key = "ubuntu_" + os_result.ubuntu_release
+        wheel = wheels.get(key)
+    if wheel == None:
+        fail("Unsupported platform")
+
+    repository_ctx.download_and_extract(
+        url = wheel["url"],
+        sha256 = wheel["sha256"],
+        type = "zip",
+    )
 
     file_content = """# -*- python -*-
 
 # DO NOT EDIT: generated by numpy_repository()
 
+load("@drake//tools/install:install.bzl", "install")
+
 licenses([
     "notice",  # BSD-2-Clause AND BSD-3-Clause AND MIT AND Python-2.0
     "unencumbered",  # Public-Domain
 ])
 
-cc_library(
-    name = "numpy",
-    hdrs = glob(["include/**"]),
-    includes = ["include"],
+# Interpret `numpy` sources as data to simplify handling.
+filegroup(
+    name = "data",
+    srcs = glob(["numpy/**/*"]),
+    visibility = ["//visibility:private"],
+)
+
+py_library(
+    name = "numpy_py",
+    imports = ["."],
+    visibility = ["//visibility:public"],
+    data = [":data"],
+)
+
+install(
+    name = "install",
+    data = [":data"],
+    data_dest = "lib/python2.7/site-packages",
     visibility = ["//visibility:public"],
 )
     """
@@ -74,6 +106,4 @@ cc_library(
 
 numpy_repository = repository_rule(
     _impl,
-    attrs = {"python_version": attr.string(default = "2")},
-    local = True,
 )

tools/workspace/numpy/test/numpy_test.py

@@ -0,0 +1,9 @@
+"""
+Tests that we can import NumPy, and have the version that we desire.
+"""
+
+import numpy as np
+
+assert ".runfiles" in np.__file__, (
+    "You must use the Bazel-specified `numpy`! Please ensure your WORKSPACE "
+    "and usage of `numpy_repository` are well-formed.")

tools/workspace/pybind11/package.BUILD.bazel

@@ -44,7 +44,6 @@ cc_library(
     includes = ["include"],
     deps = [
         "@eigen",
-        "@numpy",
         "@python",
     ],
 )