Replace distutils.spawn (deprecated) with shutil.which

merlin/systems/triton/utils.py

@@ -1,11 +1,11 @@
 import contextlib
 import logging
 import os
+import shutil
 import signal
 import socket
 import subprocess
 import time
-from distutils.spawn import find_executable
 
 import tritonclient
 import tritonclient.grpc as grpcclient
@@ -14,7 +14,7 @@
 
 LOG = logging.getLogger("merlin-systems")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @contextlib.contextmanager

tests/conftest.py

@@ -16,7 +16,7 @@
 
 import glob
 import random
-from distutils.spawn import find_executable
+import shutil
 from pathlib import Path
 
 import dask
@@ -50,7 +50,7 @@ def assert_eq(a, b, *args, **kwargs):
 
 
 REPO_ROOT = Path(__file__).parent.parent
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 allcols_csv = ["timestamp", "id", "label", "name-string", "x", "y", "z"]

tests/integration/examples/test_serving_an_implicit_model_with_merlin_systems.py

@@ -1,4 +1,4 @@
-from distutils.spawn import find_executable  # pylint: disable=deprecated-module
+import shutil
 
 import pytest
 from testbook import testbook
@@ -17,7 +17,7 @@
 except ImportError:
     _TRAIN_ON_GPU = [False]
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.notebook

tests/integration/examples/test_serving_an_xgboost_model_with_merlin_systems.py

@@ -1,4 +1,4 @@
-from distutils.spawn import find_executable  # pylint: disable=deprecated-module
+import shutil
 
 import pytest
 from testbook import testbook
@@ -10,7 +10,7 @@
 pytest.importorskip("merlin.models")
 pytest.importorskip("xgboost")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/ops/test_ops.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import random
-from distutils.spawn import find_executable
+import shutil
 
 import numpy as np
 import pytest
@@ -26,7 +26,7 @@
 from merlin.systems.dag.ops.softmax_sampling import SoftmaxSampling
 from merlin.systems.triton.utils import run_ensemble_on_tritonserver
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/runtimes/triton/ops/fil/test_lightgbm_triton.py

@@ -1,4 +1,4 @@
-from distutils.spawn import find_executable  # pylint: disable=W0402
+import shutil
 
 import numpy as np
 import pandas as pd
@@ -16,7 +16,7 @@
 triton = pytest.importorskip("merlin.systems.triton")
 export = pytest.importorskip("merlin.systems.dag.ensemble")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/runtimes/triton/ops/fil/test_sklearn_triton.py

@@ -1,4 +1,4 @@
-from distutils.spawn import find_executable  # pylint: disable=W0402
+import shutil
 
 import numpy as np
 import pandas as pd
@@ -16,7 +16,7 @@
 triton = pytest.importorskip("merlin.systems.triton")
 export = pytest.importorskip("merlin.systems.dag.ensemble")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/runtimes/triton/ops/fil/test_xgboost_triton.py

@@ -1,4 +1,4 @@
-from distutils.spawn import find_executable  # pylint: disable=W0402
+import shutil
 
 import numpy as np
 import pandas as pd
@@ -16,7 +16,7 @@
 triton = pytest.importorskip("merlin.systems.triton")
 export = pytest.importorskip("merlin.systems.dag.ensemble")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/runtimes/triton/ops/torch/test_op.py

@@ -15,7 +15,7 @@
 #
 
 import pathlib
-from distutils.spawn import find_executable  # pylint: disable=deprecated-module
+import shutil
 from pathlib import Path
 from typing import Dict
 
@@ -30,7 +30,7 @@
 from merlin.systems.dag.runtimes.triton import TritonExecutorRuntime
 from merlin.systems.triton.utils import run_triton_server
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 torch = pytest.importorskip("torch")
 triton = pytest.importorskip("merlin.systems.triton")

tests/unit/systems/dag/runtimes/triton/ops/workflow/test_ensemble.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from distutils.spawn import find_executable  # pylint: disable=deprecated-module
+import shutil
 
 import numpy as np
 import pytest
@@ -24,7 +24,7 @@
 from nvtabular import Workflow
 from nvtabular import ops as wf_ops
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 triton = pytest.importorskip("merlin.systems.triton")
 ensemble = pytest.importorskip("merlin.systems.dag.ensemble")

tests/unit/systems/dag/runtimes/triton/test_triton.py

@@ -15,7 +15,7 @@
 #
 
 import random
-from distutils.spawn import find_executable  # pylint: disable=W0402
+import shutil
 
 import numpy as np
 import pytest
@@ -30,7 +30,7 @@
 triton = pytest.importorskip("merlin.systems.triton")
 export = pytest.importorskip("merlin.systems.dag.ensemble")
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/dag/test_executors.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import random
-from distutils.spawn import find_executable
+import shutil
 
 import numpy as np
 import pandas as pd
@@ -28,7 +28,7 @@
 from merlin.systems.dag.ensemble import Ensemble
 from merlin.systems.dag.ops.session_filter import FilterCandidates
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 def test_run_dag_on_dictarray_with_local_executor():

tests/unit/systems/ops/faiss/test_executor.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from distutils.spawn import find_executable  # pylint: disable=W0402
+import shutil
 
 import numpy as np
 import pytest
@@ -23,7 +23,7 @@
 from merlin.systems.dag.ensemble import Ensemble
 from merlin.systems.dag.ops.faiss import QueryFaiss, setup_faiss
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 pytest.importorskip("merlin.dataloader.tf_utils")
 from merlin.dataloader.tf_utils import configure_tensorflow  # noqa
 

tests/unit/systems/ops/fil/test_ensemble.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-from distutils.spawn import find_executable
+import shutil
 
 import numpy as np
 import pandas as pd
@@ -38,7 +38,7 @@
 from merlin.systems.dag.ops.workflow import TransformWorkflow  # noqa
 from merlin.systems.triton.utils import run_ensemble_on_tritonserver  # noqa
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")

tests/unit/systems/ops/implicit/test_executor.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from distutils.spawn import find_executable
+import shutil
 
 import implicit
 import numpy as np
@@ -25,7 +25,7 @@
 from merlin.systems.dag.ensemble import Ensemble
 from merlin.systems.dag.ops.implicit import PredictImplicit
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 tritonclient = pytest.importorskip("tritonclient")
 grpcclient = pytest.importorskip("tritonclient.grpc")

tests/unit/systems/ops/implicit/test_op.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import json
-from distutils.spawn import find_executable
+import shutil
 
 import implicit
 import numpy as np
@@ -28,7 +28,7 @@
 from merlin.systems.dag.runtimes.triton import TritonExecutorRuntime
 from merlin.systems.triton.utils import run_triton_server
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 triton = pytest.importorskip("merlin.systems.triton")
 

tests/unit/systems/ops/tf/test_ensemble.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 import os
-from distutils.spawn import find_executable
+import shutil
 
 import pytest
 
@@ -45,7 +45,7 @@
 from merlin.systems.triton.utils import run_ensemble_on_tritonserver  # noqa
 from tests.unit.systems.utils.tf import create_tf_model  # noqa
 
-TRITON_SERVER_PATH = find_executable("tritonserver")
+TRITON_SERVER_PATH = shutil.which("tritonserver")
 
 
 @pytest.mark.skipif(not TRITON_SERVER_PATH, reason="triton server not found")