Fix the docker build (#39)

Summary:
Need to fix the docker build script as we renamed utils to tools directory.

Pull Request resolved: #39

Reviewed By: FindHao

Differential Revision: D65502921

Pulled By: xuzhao9

fbshipit-source-id: d8bdb97d6e3db7b7ac0e96c51b4f8a3018ef07cc

Author: xuzhao9

docker/tritonbench-nightly.dockerfile

@@ -16,19 +16,19 @@ RUN git clone --recurse-submodules -b "${TRITONBENCH_BRANCH}" --single-branch \
 # Setup conda env and CUDA
 RUN cd /workspace/tritonbench && \
     . ${SETUP_SCRIPT} && \
-    python ./utils/python_utils.py --create-conda-env ${CONDA_ENV} && \
+    python tools/python_utils.py --create-conda-env ${CONDA_ENV} && \
     echo "if [ -z \${CONDA_ENV} ]; then export CONDA_ENV=${CONDA_ENV}; fi" >> /workspace/setup_instance.sh && \
     echo "conda activate \${CONDA_ENV}" >> /workspace/setup_instance.sh
 
 RUN cd /workspace/tritonbench && \
     . ${SETUP_SCRIPT} && \
-    sudo python ./utils/cuda_utils.py --setup-cuda-softlink
+    sudo python tools/cuda_utils.py --setup-cuda-softlink
 
 # Install PyTorch nightly and verify the date is correct
 RUN cd /workspace/tritonbench && \
     . ${SETUP_SCRIPT} && \
-    python utils/cuda_utils.py --install-torch-deps && \
-    python utils/cuda_utils.py --install-torch-nightly
+    python tools/cuda_utils.py --install-torch-deps && \
+    python tools/cuda_utils.py --install-torch-nightly
 
 # Check the installed version of nightly if needed
 RUN cd /workspace/tritonbench && \
@@ -37,9 +37,9 @@ RUN cd /workspace/tritonbench && \
         echo "torch version check skipped"; \
     elif [ -z "${FORCE_DATE}" ]; then \
         FORCE_DATE=$(date '+%Y%m%d') \
-        python utils/cuda_utils.py --check-torch-nightly-version --force-date "${FORCE_DATE}"; \
+        python tools/cuda_utils.py --check-torch-nightly-version --force-date "${FORCE_DATE}"; \
     else \
-        python utils/cuda_utils.py --check-torch-nightly-version --force-date "${FORCE_DATE}"; \
+        python tools/cuda_utils.py --check-torch-nightly-version --force-date "${FORCE_DATE}"; \
     fi
 
 # Tritonbench library build and test require libcuda.so.1

install.py

@@ -53,7 +53,7 @@ def test_fbgemm():
 
 
 def install_cutlass():
-    from utils.cutlass_kernels.install import install_colfax_cutlass
+    from tools.cutlass_kernels.install import install_colfax_cutlass
 
     install_colfax_cutlass()
 
@@ -84,7 +84,7 @@ def install_liger():
 
 
 def install_tk():
-    from utils.tk.install import install_tk
+    from tools.tk.install import install_tk
 
     install_tk()
 

tools/cutlass_kernels/install.py

@@ -11,7 +11,7 @@
 FBGEMM_PATH = REPO_PATH.joinpath("submodules", "FBGEMM", "fbgemm_gpu")
 FBGEMM_CUTLASS_PATH = FBGEMM_PATH.parent.joinpath("external", "cutlass")
 COLFAX_CUTLASS_PATH = REPO_PATH.joinpath("submodules", "cutlass-kernels")
-COLFAX_CUTLASS_TRITONBENCH_PATH = REPO_PATH.joinpath("utils", "cutlass_kernels")
+COLFAX_CUTLASS_TRITONBENCH_PATH = REPO_PATH.joinpath("tools", "cutlass_kernels")
 
 TORCH_BASE_PATH = Path(torch.__file__).parent
 

tools/tk/install.py

@@ -11,7 +11,7 @@
 REPO_PATH = Path(os.path.abspath(__file__)).parent.parent.parent
 TK_PATH = REPO_PATH.joinpath("submodules", "ThunderKittens")
 TK_PYUTILS_PATH = TK_PATH.joinpath("src", "common", "pyutils")
-TRITONBENCH_TK_PATH = REPO_PATH.joinpath("utils", "tk")
+TRITONBENCH_TK_PATH = REPO_PATH.joinpath("tools", "tk")
 TORCH_BASE_PATH = Path(torch.__file__).parent
 CONDA_PREFIX = os.environ.get("CONDA_PREFIX", None)
 PYTHON_VERSION = f"python{sys.version_info[0]}.{sys.version_info[1]}"