fix cpu<1 cases

Author: TrevorBergeron

bigframes/functions/_function_client.py

@@ -645,8 +645,10 @@ def provision_bq_remote_function(
         # assumption is most bigframes functions are cpu bound, single-threaded and many won't release GIL
         # therefore, want to allocate a worker for each cpu, and allow a concurrent request per worker
         expected_milli_cpus = (
-            cloud_function_cpus * 1000
-        ) or _infer_milli_cpus_from_memory(cloud_function_memory_mib)
+            int(cloud_function_cpus * 1000)
+            if (cloud_function_cpus is not None)
+            else _infer_milli_cpus_from_memory(cloud_function_memory_mib)
+        )
         workers = -(expected_milli_cpus // -1000)  # ceil(cpus) without invoking floats
         threads = 4  # (per worker)
         # max concurrency==1 for vcpus < 1 hard limit from cloud run

bigframes/functions/_function_session.py

@@ -249,7 +249,7 @@ def remote_function(
             Literal["all", "private-ranges-only", "unspecified"]
         ] = None,
         cloud_function_memory_mib: Optional[int] = None,
-        cloud_function_cpus: Optional[int] = None,
+        cloud_function_cpus: Optional[float] = None,
         cloud_function_ingress_settings: Literal[
             "all", "internal-only", "internal-and-gclb"
         ] = "internal-only",
@@ -445,8 +445,8 @@ def remote_function(
                 default memory of cloud functions be allocated, pass `None`. See
                 for more details
                 https://cloud.google.com/functions/docs/configuring/memory.
-            cloud_function_cpus (int, Optional):
-                The amounts of memory (in mebibytes) to allocate for the cloud
+            cloud_function_cpus (float, Optional):
+                The number of cpus to allocate for the cloud
                 function (2nd gen) created.
                 https://docs.cloud.google.com/run/docs/configuring/services/cpu.
             cloud_function_ingress_settings (str, Optional):

bigframes/pandas/__init__.py

@@ -89,7 +89,7 @@ def remote_function(
         Literal["all", "private-ranges-only", "unspecified"]
     ] = None,
     cloud_function_memory_mib: Optional[int] = None,
-    cloud_function_cpus: Optional[int] = None,
+    cloud_function_cpus: Optional[float] = None,
     cloud_function_ingress_settings: Literal[
         "all", "internal-only", "internal-and-gclb"
     ] = "internal-only",

bigframes/session/__init__.py

@@ -1538,7 +1538,7 @@ def remote_function(
             Literal["all", "private-ranges-only", "unspecified"]
         ] = None,
         cloud_function_memory_mib: Optional[int] = None,
-        cloud_function_cpus: Optional[int] = None,
+        cloud_function_cpus: Optional[float] = None,
         cloud_function_ingress_settings: Literal[
             "all", "internal-only", "internal-and-gclb"
         ] = "internal-only",
@@ -1719,8 +1719,8 @@ def remote_function(
                 default memory of cloud functions be allocated, pass `None`. See
                 for more details
                 https://cloud.google.com/functions/docs/configuring/memory.
-            cloud_function_cpus (int, Optional):
-                The amounts of memory (in mebibytes) to allocate for the cloud
+            cloud_function_cpus (float, Optional):
+                The number of cpus to allocate for the cloud
                 function (2nd gen) created.
                 https://docs.cloud.google.com/run/docs/configuring/services/cpu.
             cloud_function_ingress_settings (str, Optional):

tests/system/large/functions/test_remote_function.py

@@ -2093,19 +2093,40 @@ def foo_list(x: pandas.Series, y0: float, y1, y2) -> list[str]:
 
 
 @pytest.mark.parametrize(
-    ("memory_mib_args", "expected_memory"),
+    (
+        "memory_mib_args",
+        "expected_memory",
+        "expected_cpus",
+    ),
     [
-        pytest.param({}, "1024Mi", id="no-set"),
-        pytest.param({"cloud_function_memory_mib": None}, "256M", id="set-None"),
-        pytest.param({"cloud_function_memory_mib": 128}, "128Mi", id="set-128"),
-        pytest.param({"cloud_function_memory_mib": 1024}, "1024Mi", id="set-1024"),
-        pytest.param({"cloud_function_memory_mib": 4096}, "4096Mi", id="set-4096"),
-        pytest.param({"cloud_function_memory_mib": 32768}, "32768Mi", id="set-32768"),
+        pytest.param({}, "1024Mi", None, id="no-set"),
+        pytest.param(
+            {"cloud_function_memory_mib": None}, "1024Mi", None, id="set-None"
+        ),
+        pytest.param({"cloud_function_memory_mib": 128}, "128Mi", None, id="set-128"),
+        pytest.param(
+            {"cloud_function_memory_mib": 512, "cloud_function_cpus": 0.6},
+            "512Mi",
+            "0.6",
+            id="set-512",
+        ),
+        pytest.param(
+            {"cloud_function_memory_mib": 1024}, "1024Mi", None, id="set-1024"
+        ),
+        pytest.param(
+            {"cloud_function_memory_mib": 4096, "cloud_function_cpus": 4},
+            "4096Mi",
+            "4",
+            id="set-4096",
+        ),
+        pytest.param(
+            {"cloud_function_memory_mib": 32768}, "32768Mi", None, id="set-32768"
+        ),
     ],
 )
 @pytest.mark.flaky(retries=2, delay=120)
 def test_remote_function_gcf_memory(
-    session, scalars_dfs, memory_mib_args, expected_memory
+    session, scalars_dfs, memory_mib_args, expected_memory, expected_cpus
 ):
     try:
 
@@ -2121,6 +2142,12 @@ def square(x: int) -> int:
             name=square_remote.bigframes_cloud_function
         )
         assert gcf.service_config.available_memory == expected_memory
+        if expected_cpus is not None:
+            assert gcf.service_config.available_cpu == expected_cpus
+        if float(gcf.service_config.available_cpu) >= 1.0:
+            assert gcf.service_config.max_instance_request_concurrency >= float(
+                gcf.service_config.available_cpu
+            )
 
         scalars_df, scalars_pandas_df = scalars_dfs