Small build fixes

build.toml

@@ -1,6 +1,8 @@
 [general]
-name = "vllm-flash-attn3"
+name = "vllm_flash_attn3"
 universal = false
+cuda-minver = "12.4"
+cuda-maxver = "12.4"
 
 [torch]
 src = [
@@ -25,7 +27,7 @@ cuda-flags = [
   "--use_fast_math",
   "-DNDEBUG",
 ]
-
+cxx-flags = ["-DFLASHATTENTION_DISABLE_PYBIND"]
 src = [
   "flash-attn/cuda_check.h",
   "flash-attn/flash_api.cpp",
@@ -57,7 +59,6 @@ cuda-flags = [
   "--expt-extended-lambda",
   "--use_fast_math",
   "-DNDEBUG",
-  "-DFLASHATTENTION_DISABLE_PYBIND",
 ]
 src = [
   "flash-attn/block.h",
@@ -87,6 +88,7 @@ src = [
   "flash-attn/softmax.h",
   "flash-attn/tile_size.h",
   "flash-attn/tile_scheduler.hpp",
+
   "flash-attn/instantiations/flash_bwd_hdim128_bf16_sm80.cu",
   "flash-attn/instantiations/flash_bwd_hdim128_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_bwd_hdim128_fp16_sm80.cu",
@@ -108,85 +110,85 @@ src = [
   "flash-attn/instantiations/flash_bwd_hdim96_fp16_sm80.cu",
   "flash-attn/instantiations/flash_bwd_hdim96_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_bf16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_bf16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_bf16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_bf16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_bf16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_bf16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_fp16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_fp16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_fp16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim128_fp16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim128_fp16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim128_fp16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_bf16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_bf16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_bf16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_bf16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_bf16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_bf16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_fp16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_fp16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_fp16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim192_fp16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim192_fp16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim192_fp16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_bf16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_bf16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_bf16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_bf16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_bf16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_bf16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_fp16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_fp16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_fp16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim256_fp16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim256_fp16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim256_fp16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_bf16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_bf16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_bf16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_bf16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_bf16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_bf16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_fp16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_fp16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_fp16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim64_fp16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim64_fp16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim64_fp16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_bf16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_bf16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_bf16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_bf16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_bf16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_bf16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_bf16_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_fp16_paged_split_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_fp16_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_fp16_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_fp16_softcap_sm80.cu",
   "flash-attn/instantiations/flash_fwd_hdim96_fp16_split_sm80.cu",
-  "flash-attn/instantiations/flash_fwd_hdim96_fp16_split_softcapall_sm80.cu",
+  "flash-attn/instantiations/flash_fwd_hdim96_fp16_split_softcap_sm80.cu"
 ]
 include = ["flash-attn"]
 depends = ["torch", "cutlass_3_9"]

flake.lock

@@ -98,11 +98,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750275112,
-        "narHash": "sha256-gqAxmLLt0tYvuRYumOZHQgryMeEFdt6j3nEC8B5rT14=",
+        "lastModified": 1750860635,
+        "narHash": "sha256-Wzz7UQRuzSAQCvmPclYN/xmAqpMR19QDgmsCzknAzeo=",
         "owner": "huggingface",
         "repo": "kernel-builder",
-        "rev": "1b63210b2a1fc3cda2e3a579e7aa8f8c8532626f",
+        "rev": "7e2d7303d9f2d49d470bddcbb8379fffeee38dcf",
         "type": "github"
       },
       "original": {

flash-attn/flash_api.cpp

@@ -1620,4 +1620,4 @@ PYBIND11_MODULE(TORCH_EXTENSION_NAME, m) {
     m.def("get_scheduler_metadata", &mha_fwd_get_scheduler_metadata, "Get scheduler metadata for varlen forward pass");
 }
 
-#endif
+#endif