add missing files

xadupre · xadupre · commit 6a91f129ff4b · 2023-10-01T13:11:33.000+02:00
diff --git a/_cmake/targets/common.cmake b/_cmake/targets/common.cmake
@@ -0,0 +1,7 @@
+#
+# module: common C++ libraries
+#
+# message(STATUS "+ mlinsights.common")
+# add_library(common STATIC ../onnx_extended/cpp/onnx_extended_helpers.cpp)
+# target_compile_definitions(common PRIVATE PYTHON_MANYLINUX=${PYTHON_MANYLINUX})
+# target_include_directories(common PRIVATE "${ROOT_INCLUDE_PATH}")
diff --git a/mlinsights/ext_test_case.py b/mlinsights/ext_test_case.py
@@ -5,7 +5,7 @@
 import zipfile
 from io import BytesIO
 from urllib.request import urlopen
-from argparse import ArgumentParser
+from argparse import ArgumentParser, Namespace
 from contextlib import redirect_stderr, redirect_stdout
 from io import StringIO
 from timeit import Timer
@@ -107,7 +107,7 @@ def measure_time(
                 "div_by_number must be set to True of max_time is defined."
             )
         i = 1
-        total_time = 0
+        total_time = 0.0
         results = []
         while True:
             for j in (1, 2):
@@ -168,7 +168,7 @@ def measure_time(
 
 
 class ExtTestCase(unittest.TestCase):
-    _warns = []
+    _warns: List[type] = []
 
     def assertExists(self, name):
         if not os.path.exists(name):
@@ -245,7 +245,7 @@ def assertAlmostEqual(
         self.assertEqualArray(expected, value, atol=atol, rtol=rtol)
 
     def assertRaise(
-        self, fct: Callable, exc_type: Exception, msg: Optional[str] = None
+        self, fct: Callable, exc_type: type[Exception], msg: Optional[str] = None
     ):
         try:
             fct()
@@ -340,7 +340,7 @@ def get_parsed_args(
     tries: int = 2,
     expose: Optional[str] = None,
     **kwargs: Dict[str, Tuple[Union[int, str, float], str]],
-) -> ArgumentParser:
+) -> Namespace:
     """
     Returns parsed arguments for examples in this package.
 
@@ -428,7 +428,7 @@ def unzip_files(
     fvalid: Optional[Callable] = None,
     fail_if_error=True,
     verbose: int = 0,
-):
+) -> List[Union[str, Tuple[str, Any]]]:
     """
     Unzips files from a zip archive.
 
@@ -445,6 +445,8 @@ def unzip_files(
     :return: list of unzipped files
     """
     if zipf.startswith("https:"):
+        if where_to is None:
+            raise ValueError(f"where_to must be specified for url {zipf!r}.")
         filename = zipf.split("/")[-1]
         dest_zip = os.path.join(where_to, filename)
         if not os.path.exists(dest_zip):
@@ -469,7 +471,7 @@ def unzip_files(
             raise e
         raise IOError(f"Unable to read file '{zipf}'") from e
 
-    files = []
+    files: List[Union[str, Tuple[str, Any]]] = []
     with zipfile.ZipFile(zipf, "r") as file:
         for info in file.infolist():
             if verbose > 1:
diff --git a/pyproject.toml b/pyproject.toml
@@ -139,16 +139,8 @@ exclude = [
 ]
 
 [[tool.mypy.overrides]]
-module = ["onnx_extended._command_lines"]
-disable_error_code = [
-    "attr-defined",
-    "operator",
-    "arg-type",
-    "assignment",
-    "var-annotated",
-    "return-value",
-    "name-defined",
-]
+module = ["mlinsights.ext_test_case"]
+disable_error_code = ["override", "index"]
 
 [tool.ruff]
 exclude = [".eggs", ".git", "build", "dist"]
diff --git a/setup.py b/setup.py
@@ -260,7 +260,6 @@ def initialize_options(self):
         self.cuda_version = None
         self.parallel = None
         self.manylinux = None
-        self.ort_version = DEFAULT_ORT_VERSION
         self.cuda_build = "DEFAULT"
         self.cuda_link = "STATIC"
 
@@ -281,10 +280,6 @@ def initialize_options(self):
             print(f"-- setup: use env {att.upper()}={v in t_values}")
             setattr(self, att, v in t_values)
 
-        if self.ort_version is None:
-            self.ort_version = os.environ.get("ORT_VERSION", None)
-            if self.ort_version not in ("", None):
-                print(f"-- setup: use env ORT_VERSION={self.ort_version}")
         if self.cuda_build is None:
             self.cuda_build = os.environ.get("CUDA_BUILD", None)
             if self.cuda_build not in ("", None):
@@ -382,7 +377,6 @@ def get_cmake_args(self, cfg: str) -> List[str]:
             f"-DPYTHON_VERSION={vers}",
             f"-DPYTHON_VERSION_MM={versmm}",
             f"-DPYTHON_MODULE_EXTENSION={module_ext}",
-            f"-DORT_VERSION={self.ort_version}",
             f"-DMLINSIGHTS_VERSION={get_version_str(here, None)}",
             f"-DPYTHON_MANYLINUX={1 if is_manylinux else 0}",
         ]
@@ -391,7 +385,7 @@ def get_cmake_args(self, cfg: str) -> List[str]:
 
         if self.use_nvtx:
             cmake_args.append("-DUSE_NVTX=1")
-        cmake_args.append(f"-DUSE_CUDA={1 if self.use_cuda else 0}")
+        cmake_args.append("-DUSE_CUDA=0")  # {1 if self.use_cuda else 0}")
         if self.use_cuda:
             cmake_args.append(f"-DCUDA_BUILD={self.cuda_build}")
             cmake_args.append(f"-DCUDA_LINK={self.cuda_link}")
