conflict with main

microsoft · Jan 30, 2024 · 40de1a1 · 40de1a1
1 parent 423aa1f
commit 40de1a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake/external/cutlass.cmake b/cmake/external/cutlass.cmake
@@ -1,8 +1,8 @@
 include(FetchContent)
 FetchContent_Declare(
-    cutlass
-    URL ${DEP_URL_cutlass}
-    URL_HASH SHA1=${DEP_SHA1_cutlass}
+  cutlass
+  URL ${DEP_URL_cutlass}
+  URL_HASH SHA1=${DEP_SHA1_cutlass}
 )
 
 FetchContent_GetProperties(cutlass)

diff --git a/cmake/external/emsdk b/cmake/external/emsdk
+59 −8		.circleci/config.yml
+16 −15		.flake8
+3 −3		README.md
+8 −0		bazel/BUILD
+2 −2		bazel/README.md
+14 −10		bazel/emscripten_deps.bzl
+10 −1		bazel/emscripten_toolchain/BUILD.bazel
+2 −2		bazel/emscripten_toolchain/toolchain.bzl
+3 −1		bazel/emscripten_toolchain/wasm_cc_binary.bzl
+50 −1		bazel/revisions.bzl
+3 −0		docker/Makefile
+16 −2		emscripten-releases-tags.json
+57 −19		emsdk.py
+4 −4		emsdk_manifest.json
+3 −1		scripts/create_release.py
+69 −0		scripts/update_bazel_workspace.py
+0 −73		scripts/update_bazel_workspace.sh
+23 −0		scripts/update_linux_arm64.sh
+1 −2		test/test_activation.ps1
+1 −1		test/test_bazel.sh
+1 −1		test/test_bazel_mac.sh