upgrade buildifier (#127)

* Use different buildifier pre-commit

The previous one didn't seem to work when I ran it locally. Maybe a
newer version of it would, but that one doesn't seem to cache the
buildifier binary which seems like it will be a lot slower.

This also updates to the latest version of buildifier

Change-Id: Ifeec1bc6a9663619b74f7cafb1be6eb2eecf9b61

* Format with newest buildifier

Change-Id: I74fb2d01863b68ad3274bb0e0e70b3350f53e50a

.pre-commit-config.yaml

@@ -11,11 +11,10 @@ default_stages: [commit]
 
 repos:
   # Check formatting and lint for starlark code
-  - repo: https://github.com/keith/pre-commit-buildifier
-    rev: 4.0.1.1
+  - repo: https://github.com/garymm/bazel-buildifier-pre-commit-hooks
+    rev: v6.1.2
     hooks:
-      - id: buildifier
-      # - id: buildifier-lint
+      - id: bazel-buildifier
   # Enforce that commit messages allow for later changelog generation
   - repo: https://github.com/commitizen-tools/commitizen
     rev: v2.18.0

cuda/templates/BUILD.local_toolchain_clang

@@ -2,19 +2,19 @@
 
 load(
     "@rules_cuda//cuda:defs.bzl",
-    "cuda_toolkit",
     "cuda_toolchain",
+    "cuda_toolkit",
     cuda_toolchain_config = "cuda_toolchain_config_clang",
 )
 
 cuda_toolkit(
     name = "cuda-toolkit",
-    path = "%{cuda_path}",
-    version = "%{cuda_version}",
-    nvlink = "%{nvlink_label}",
-    link_stub = "%{link_stub_label}",
     bin2c = "%{bin2c_label}",
     fatbinary = "%{fatbinary_label}",
+    link_stub = "%{link_stub_label}",
+    nvlink = "%{nvlink_label}",
+    path = "%{cuda_path}",
+    version = "%{cuda_version}",
 )
 
 cuda_toolchain_config(

cuda/templates/BUILD.local_toolchain_nvcc

@@ -20,8 +20,9 @@ cuda_toolkit(
 cuda_toolchain_config(
     name = "nvcc-local-config",
     cuda_toolkit = ":cuda-toolkit",
-    nvcc_version_major = %{nvcc_version_major},
-    nvcc_version_minor = %{nvcc_version_minor},
+    # int("%{foo}") instead of %{foo} to make the file valid syntactically.
+    nvcc_version_major = int("%{nvcc_version_major}"),
+    nvcc_version_minor = int("%{nvcc_version_minor}"),
     toolchain_identifier = "nvcc",
 )
 

cuda/templates/BUILD.local_toolchain_nvcc_msvc

@@ -21,8 +21,9 @@ cuda_toolchain_config(
     name = "nvcc-local-config",
     cuda_toolkit = ":cuda-toolkit",
     msvc_env_tmp = "%{env_tmp}",
-    nvcc_version_major = %{nvcc_version_major},
-    nvcc_version_minor = %{nvcc_version_minor},
+    # int("%{foo}") instead of %{foo} to make the file valid syntactically.
+    nvcc_version_major = int("%{nvcc_version_major}"),
+    nvcc_version_minor = int("%{nvcc_version_minor}"),
     toolchain_identifier = "nvcc",
 )
 

examples/WORKSPACE.bazel

@@ -13,6 +13,7 @@ local_repository(
 # you should fetch it *before* calling this.
 
 load("@rules_cuda//cuda:repositories.bzl", "register_detected_cuda_toolchains", "rules_cuda_dependencies")
+
 rules_cuda_dependencies()
-register_detected_cuda_toolchains()
 
+register_detected_cuda_toolchains()