remove duplicate Docker file

perfmetrics/scripts/continuous_test/ml_tests/pytorch/v2_hns/dino/build.sh

@@ -19,7 +19,7 @@ set -e
 VM_NAME="pytorch2-dino-7d-a100-gpu-hns-bucket"
 ZONE_NAME="us-central1-f"
 ARTIFACTS_BUCKET_PATH="gs://gcsfuse-ml-tests-logs/ci_artifacts/pytorch/v2_hns/dino"
-TEST_SCRIPT_PATH="github/gcsfuse/perfmetrics/scripts/ml_tests/pytorch/v2_hns/dino/setup_host_and_run_container.sh"
+TEST_SCRIPT_PATH="github/gcsfuse/perfmetrics/scripts/ml_tests/pytorch/v2/dino/setup_host_and_run_container.sh"
 PYTORCH_VERSION="v2"
 BUCKET_TYPE="hns"
 

perfmetrics/scripts/continuous_test/ml_tests/run_and_manage_test.sh

@@ -161,7 +161,7 @@ then
   echo "Clone the gcsfuse repo on test VM"
   sudo gcloud compute ssh $VM_NAME --zone $ZONE_NAME --internal-ip --command "mkdir github; cd github; git clone https://github.com/GoogleCloudPlatform/gcsfuse.git; cd gcsfuse; git checkout master;"
   echo "Trigger the build script on test VM"
-  sudo gcloud compute ssh $VM_NAME --zone $ZONE_NAME --internal-ip --command "bash \$HOME/$TEST_SCRIPT_PATH 1> \$HOME/build.out 2> \$HOME/build.err &"
+  sudo gcloud compute ssh $VM_NAME --zone $ZONE_NAME --internal-ip --command "bash \$HOME/$TEST_SCRIPT_PATH $BUCKET_TYPE 1> \$HOME/build.out 2> \$HOME/build.err &"
   echo "Wait for 15 minutes for test VM to setup for test and to change the status from START to RUNNING."
   sleep 900s
 

perfmetrics/scripts/ml_tests/pytorch/run_container.sh

@@ -14,11 +14,12 @@
 # limitations under the License.
 set -e
 # pytorch version (e.g. v1_12, v2)
-DIR=$1
+PYTORCH_VERSION=$1
+BUCKET_TYPE=$2
 
 cd "$HOME/github/gcsfuse"
 echo "Building docker image containing all pytorch libraries..."
-sudo docker build . -f perfmetrics/scripts/ml_tests/pytorch/${DIR}/dino/Dockerfile --tag pytorch-gcsfuse
+sudo docker build . -f perfmetrics/scripts/ml_tests/pytorch/${PYTORCH_VERSION}/dino/Dockerfile --tag pytorch-gcsfuse --build-arg PYTORCH_VERSION="${PYTORCH_VERSION}" --build-arg BUCKET_TYPE="${BUCKET_TYPE}"
 
 mkdir -p container_artifacts
 

perfmetrics/scripts/ml_tests/pytorch/v1_12/dino/Dockerfile

@@ -29,7 +29,7 @@ COPY perfmetrics/scripts/ml_tests/pytorch/run_model.sh ./
 RUN mkdir -p "run_artifacts"
 RUN mkdir -p "gcsfuse_data"
 
-ENV PYTORCH_VERSION="v1_12"
-ENV BUCKET_TYPE="non-hns"
+ARG PYTORCH_VERSION
+ARG BUCKET_TYPE
 
 ENTRYPOINT ["/bin/bash", "-c", "./run_model.sh ${PYTORCH_VERSION} ${BUCKET_TYPE}"]

perfmetrics/scripts/ml_tests/pytorch/v1_12/dino/setup_host_and_run_container.sh

@@ -23,5 +23,6 @@ echo "Setting up the machine with Docker and Nvidia Driver"
 DRIVER_VERSION="450.172.01"
 source ml_tests/setup_host.sh $DRIVER_VERSION
 
-DIR="v1_12"
-source ml_tests/pytorch/run_container.sh $DIR
+PYTORCH_VERSION="v1_12"
+BUCKET_TYPE=$1
+source ml_tests/pytorch/run_container.sh $PYTORCH_VERSION $BUCKET_TYPE

perfmetrics/scripts/ml_tests/pytorch/v2/dino/Dockerfile

@@ -39,7 +39,7 @@ COPY perfmetrics/scripts/ml_tests/pytorch/run_model.sh ./
 RUN mkdir -p "run_artifacts"
 RUN mkdir -p "gcsfuse_data"
 
-ENV PYTORCH_VERSION="v2"
-ENV BUCKET_TYPE="non-hns"
+ARG PYTORCH_VERSION
+ARG BUCKET_TYPE
 
 ENTRYPOINT ["/bin/bash", "-c", "./run_model.sh ${PYTORCH_VERSION} ${BUCKET_TYPE}"]

perfmetrics/scripts/ml_tests/pytorch/v2/dino/setup_host_and_run_container.sh

@@ -22,5 +22,7 @@ echo "Setting up the machine with Docker and Nvidia Driver"
 DRIVER_VERSION="520.61.05"
 source ml_tests/setup_host.sh $DRIVER_VERSION
 
-DIR="v2"
-source ml_tests/pytorch/run_container.sh $DIR
+
+PYTORCH_VERSION="v2"
+BUCKET_TYPE=$1
+source ml_tests/pytorch/run_container.sh $PYTORCH_VERSION $BUCKET_TYPE