fixup! feat(core.utils): _option_is_set mirrors compiler gates precisely

Author: cpcloud

cuda_core/cuda/core/utils/_program_cache.py

@@ -303,19 +303,31 @@ def _cuda_core_version() -> str:
 _SIDE_EFFECT_OPTIONS = ("create_pch", "time", "fdevice_time_trace")
 
 
+# ProgramOptions fields gated by plain truthiness in ``_program.pyx`` (the
+# compiler writes the flag only when the value is truthy). For every other
+# field listed in the cache-guard sets, the compiler uses ``is not None``,
+# so even ``False`` / ``""`` must count as set.
+_BOOLEAN_OPTION_FIELDS = frozenset({"pch"})
+
+
 def _option_is_set(options: ProgramOptions, name: str) -> bool:
     """Match how ``_program.pyx`` gates option emission.
 
-    The compiler checks ``is not None`` for path-like fields (so an empty
-    string ``""`` is still emitted as a real ``--use-pch=`` flag) but an
-    empty list/tuple in ``include_path``/``pre_include`` means "no extra
-    includes". Mirror that here so the cache-key guard neither misses a
-    real option (``create_pch=""``) nor fires on a harmless one
-    (``include_path=[]``).
+    - For boolean flags (``pch``): value must be truthy.
+    - For sequence-shaped fields (``include_path``, ``pre_include``): ``None``
+      or an empty ``list``/``tuple`` counts as absent; any other value
+      (including the empty string, which NVRTC still emits as ``--flag=``)
+      is set.
+    - For path/string-shaped fields (``create_pch``, ``time``,
+      ``fdevice_time_trace``, ``use_pch``, ``pch_dir``): ``is not None`` --
+      the compiler emits ``--flag=<value>`` for any non-None value, so
+      ``False``/``""``/``0`` must still count as set.
     """
     value = getattr(options, name, None)
-    if value is None or value is False:
+    if value is None:
         return False
+    if name in _BOOLEAN_OPTION_FIELDS:
+        return bool(value)
     return not (isinstance(value, (list, tuple)) and len(value) == 0)
 
 

cuda_core/tests/test_program_cache.py

@@ -437,6 +437,11 @@ def _flaky_replace(src, dst):
         pytest.param({"use_pch": ""}, id="use_pch_empty_string"),
         pytest.param({"pch_dir": ""}, id="pch_dir_empty_string"),
         pytest.param({"pre_include": ""}, id="pre_include_empty_string"),
+        # Same for ``False`` -- NVRTC's gate on these path-shaped fields is
+        # ``is not None``, so even False emits a real flag.
+        pytest.param({"use_pch": False}, id="use_pch_false"),
+        pytest.param({"pch_dir": False}, id="pch_dir_false"),
+        pytest.param({"pre_include": False}, id="pre_include_false"),
     ],
 )
 def test_make_program_cache_key_rejects_external_content_without_extra_digest(option_kw):
@@ -516,8 +521,13 @@ def test_make_program_cache_key_accepts_external_content_with_extra_digest():
         # compilation, so the side effect (writing the PCH) would not run.
         pytest.param({"create_pch": "out.pch"}, b"x" * 32, id="create_pch_with_extra_digest"),
         pytest.param({"create_pch": ""}, None, id="create_pch_empty_string"),
+        # NVRTC emits ``--create-pch=False`` for any non-None value, so False
+        # still triggers the side effect and must be rejected.
+        pytest.param({"create_pch": False}, None, id="create_pch_false"),
         pytest.param({"time": "timing.csv"}, None, id="time"),
+        pytest.param({"time": False}, None, id="time_false"),
         pytest.param({"fdevice_time_trace": "trace.json"}, None, id="fdevice_time_trace"),
+        pytest.param({"fdevice_time_trace": False}, None, id="fdevice_time_trace_false"),
     ],
 )
 def test_make_program_cache_key_rejects_side_effect_options_nvrtc(option_kw, extra_digest):