sdpython · xadupre · Feb 23, 2022 · Feb 23, 2022 · Feb 23, 2022
diff --git a/_doc/examples/plot_logistic_regression.py b/_doc/examples/plot_logistic_regression.py
@@ -40,5 +40,5 @@
 # it would be better to use AVX instructions and parallelisation.
 # Below, the optimisation this machine can offer.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
diff --git a/_doc/examples/plot_op_add.py b/_doc/examples/plot_op_add.py
@@ -26,7 +26,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxAdd
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_op_einsum.py b/_doc/examples/plot_op_einsum.py
@@ -33,7 +33,7 @@
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
 from opt_einsum import contract
-from mlprodict.testing.experimental_c import (
+from mlprodict.testing.experimental_c_impl.experimental_c import (
     custom_einsum_float, code_optimisation)
 from mlprodict.testing.einsum.einsum_fct import _einsum
 print(code_optimisation())

diff --git a/_doc/examples/plot_op_onnx_topk.py b/_doc/examples/plot_op_onnx_topk.py
@@ -38,7 +38,7 @@
 ############################################
 # Available optimisation on this machine.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###########################################

diff --git a/_doc/examples/plot_op_reducemax.py b/_doc/examples/plot_op_reducemax.py
@@ -25,7 +25,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxReduceMax
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_op_reducemean.py b/_doc/examples/plot_op_reducemean.py
@@ -25,7 +25,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxReduceMean
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_op_reducesum.py b/_doc/examples/plot_op_reducesum.py
@@ -25,7 +25,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxReduceSumApi11
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import (
+from mlprodict.testing.experimental_c_impl.experimental_c import (
     code_optimisation, custom_reducesum_rk_float)
 print(code_optimisation())
 

diff --git a/_doc/examples/plot_op_reducesumsquare.py b/_doc/examples/plot_op_reducesumsquare.py
@@ -25,7 +25,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxReduceSumSquare
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_op_transpose.py b/_doc/examples/plot_op_transpose.py
@@ -28,7 +28,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxTranspose
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_op_where.py b/_doc/examples/plot_op_where.py
@@ -25,7 +25,7 @@
 from skl2onnx.algebra.onnx_ops import OnnxWhere, OnnxSub, OnnxMul
 from cpyquickhelper.numbers import measure_time
 from tqdm import tqdm
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 ###################################

diff --git a/_doc/examples/plot_opml_linear_regression.py b/_doc/examples/plot_opml_linear_regression.py
@@ -37,7 +37,7 @@
 ############################################
 # Available optimisation on this machine.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 

diff --git a/_doc/examples/plot_opml_random_forest_cls_multi.py b/_doc/examples/plot_opml_random_forest_cls_multi.py
@@ -34,7 +34,7 @@
 ############################################
 # Available optimisation on this machine.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 

diff --git a/_doc/examples/plot_opml_random_forest_reg.py b/_doc/examples/plot_opml_random_forest_reg.py
@@ -62,7 +62,7 @@
 ############################################
 # Available optimisation on this machine.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 

diff --git a/_doc/examples/plot_parallelism.py b/_doc/examples/plot_parallelism.py
@@ -33,7 +33,7 @@
 #####################################
 # Available optimisations on this machine.
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 

diff --git a/_doc/examples/plot_time_tree_ensemble.py b/_doc/examples/plot_time_tree_ensemble.py
@@ -211,7 +211,7 @@ def measure_onnx_runtime(model, xt, repeat=REPEAT, number=NUMBER,
 ###########################################
 # Available optimisation on this machine:
 
-from mlprodict.testing.experimental_c import code_optimisation
+from mlprodict.testing.experimental_c_impl.experimental_c import code_optimisation
 print(code_optimisation())
 
 plt.show()
diff --git a/_doc/sphinxdoc/source/api/testing.rst b/_doc/sphinxdoc/source/api/testing.rst
@@ -8,7 +8,7 @@ Experimental implementations
 Helpers
 +++++++
 
-.. autosignature:: mlprodict.testing.experimental_c.code_optimisation
+.. autosignature:: mlprodict.testing.experimental_c_impl.experimental_c.code_optimisation
 
 Implementation of ONNX operators
 ++++++++++++++++++++++++++++++++
@@ -30,9 +30,9 @@ Einsum
 
 .. autosignature:: mlprodict.testing.einsum.einsum_impl.decompose_einsum_equation
 
-.. autosignature:: mlprodict.testing.experimental_c.custom_einsum_float
+.. autosignature:: mlprodict.testing.experimental_c_impl.experimental_c.custom_einsum_float
 
-.. autosignature:: mlprodict.testing.experimental_c.custom_einsum_double
+.. autosignature:: mlprodict.testing.experimental_c_impl.experimental_c.custom_einsum_double
 
 .. autosignature:: mlprodict.testing.einsum.einsum_bench.einsum_benchmark
 
@@ -54,6 +54,6 @@ Pad
 ReduceSum
 ^^^^^^^^^
 
-.. autosignature:: mlprodict.testing.experimental_c.custom_reducesum_rk_double
+.. autosignature:: mlprodict.testing.experimental_c_impl.experimental_c.custom_reducesum_rk_double
 
-.. autosignature:: mlprodict.testing.experimental_c.custom_reducesum_rk_float
+.. autosignature:: mlprodict.testing.experimental_c_impl.experimental_c.custom_reducesum_rk_float
diff --git a/_unittests/ut_testing/test_custom_add.py b/_unittests/ut_testing/test_custom_add.py
@@ -4,7 +4,7 @@
 import unittest
 import numpy
 from pyquickhelper.pycode import ExtTestCase
-from mlprodict.testing.experimental_c import (  # pylint: disable=E0611
+from mlprodict.testing.experimental_c_impl.experimental_c import (  # pylint: disable=E0611
     BroadcastMatrixAddLeftInplaceDouble,
     BroadcastMatrixAddLeftInplaceFloat,
     BroadcastMatrixAddLeftInplaceInt64)

diff --git a/_unittests/ut_testing/test_experimental.py b/_unittests/ut_testing/test_experimental.py
@@ -6,7 +6,7 @@
 from onnx import helper, TensorProto
 from pyquickhelper.pycode import ExtTestCase, is_travis_or_appveyor
 from mlprodict.testing.experimental import custom_pad, custom_einsum
-from mlprodict.testing.experimental_c import (  # pylint: disable=E0611,E0401
+from mlprodict.testing.experimental_c_impl.experimental_c import (  # pylint: disable=E0611,E0401
     custom_einsum_double, custom_einsum_int64, custom_einsum_float,
     code_optimisation, custom_reducesum_rk_double,
     custom_reducesum_rk_float)

diff --git a/mlprodict/testing/experimental_c_impl/__init__.py b/mlprodict/testing/experimental_c_impl/__init__.py
@@ -0,0 +1,5 @@
+"""
+@file
+@brief Shortcut to *testing.experimental_c*.
+"""
+
diff --git a/mlprodict/testing/experimental_c.cpp → ...ng/experimental_c_impl/experimental_c.cpp b/mlprodict/testing/experimental_c.cpp → ...ng/experimental_c_impl/experimental_c.cpp
diff --git a/mlprodict/testing/experimental_c.h → ...ting/experimental_c_impl/experimental_c.h b/mlprodict/testing/experimental_c.h → ...ting/experimental_c_impl/experimental_c.h
diff --git a/mlprodict/testing/experimental_c_add.h → .../experimental_c_impl/experimental_c_add.h b/mlprodict/testing/experimental_c_add.h → .../experimental_c_impl/experimental_c_add.h
diff --git a/mlprodict/testing/experimental_c_add.hpp → ...xperimental_c_impl/experimental_c_add.hpp b/mlprodict/testing/experimental_c_add.hpp → ...xperimental_c_impl/experimental_c_add.hpp
diff --git a/mlprodict/testing/experimental_c_einsum.h → ...perimental_c_impl/experimental_c_einsum.h b/mlprodict/testing/experimental_c_einsum.h → ...perimental_c_impl/experimental_c_einsum.h
diff --git a/mlprodict/testing/experimental_c_einsum.hpp → ...rimental_c_impl/experimental_c_einsum.hpp b/mlprodict/testing/experimental_c_einsum.hpp → ...rimental_c_impl/experimental_c_einsum.hpp
diff --git a/mlprodict/testing/experimental_c_helper.h → ...perimental_c_impl/experimental_c_helper.h b/mlprodict/testing/experimental_c_helper.h → ...perimental_c_impl/experimental_c_helper.h
diff --git a/mlprodict/testing/experimental_c_helper.hpp → ...rimental_c_impl/experimental_c_helper.hpp b/mlprodict/testing/experimental_c_helper.hpp → ...rimental_c_impl/experimental_c_helper.hpp
diff --git a/mlprodict/testing/experimental_c_reduce.h → ...perimental_c_impl/experimental_c_reduce.h b/mlprodict/testing/experimental_c_reduce.h → ...perimental_c_impl/experimental_c_reduce.h
diff --git a/mlprodict/testing/experimental_c_reduce.hpp → ...rimental_c_impl/experimental_c_reduce.hpp b/mlprodict/testing/experimental_c_reduce.hpp → ...rimental_c_impl/experimental_c_reduce.hpp
diff --git a/setup.py b/setup.py
@@ -306,15 +306,15 @@ def get_extensions():
         language='c++')
 
     ext_experimental_c = Extension(
-        'mlprodict.testing.experimental_c',
-        [os.path.join(root, 'mlprodict/testing/experimental_c.cpp')],
+        'mlprodict.testing.experimental_c_impl.experimental_c',
+        [os.path.join(root, 'mlprodict/testing/experimental_c_impl/experimental_c.cpp')],
         extra_compile_args=extra_compile_args,
         extra_link_args=extra_link_args,
         include_dirs=[
             # Path to pybind11 headers
             get_pybind_include(),
             get_pybind_include(user=True),
-            os.path.join(root, 'mlprodict/testing')
+            os.path.join(root, 'mlprodict/testing/experimental_c_impl')
         ],
         define_macros=define_macros,
         language='c++')