Fix merge conflicts

Author: pragupta

.ci/docker/ci_commit_pins/triton.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
 1cc4a7c4aac921b7fa4658e162058632b7faed55
-=======
-27664085f804afc83df26f740bb46c365854f2c4
->>>>>>> upstream/main

.ci/docker/libtorch/build.sh

@@ -46,15 +46,11 @@ case ${DOCKER_TAG_PREFIX} in
         BASE_TARGET=rocm
         GPU_IMAGE=rocm/dev-ubuntu-22.04:${GPU_ARCH_VERSION}-complete
         PYTORCH_ROCM_ARCH="gfx900;gfx906;gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201"
-<<<<<<< HEAD
-        DOCKER_GPU_BUILD_ARG="--build-arg PYTORCH_ROCM_ARCH=${PYTORCH_ROCM_ARCH}"
-=======
         # add gfx950 conditionally starting in ROCm 7.0
         if [[ "$GPU_ARCH_VERSION" == *"7.0"* ]]; then
             PYTORCH_ROCM_ARCH="${PYTORCH_ROCM_ARCH};gfx950"
         fi
         DOCKER_GPU_BUILD_ARG="--build-arg PYTORCH_ROCM_ARCH=${PYTORCH_ROCM_ARCH} --build-arg ROCM_VERSION=${GPU_ARCH_VERSION}"
->>>>>>> upstream/main
         ;;
     *)
         echo "ERROR: Unrecognized DOCKER_TAG_PREFIX: ${DOCKER_TAG_PREFIX}"

CMakeLists.txt

@@ -903,13 +903,8 @@ cmake_dependent_option(
   USE_FBGEMM_GENAI
   "Whether to build FBGEMM GenAI quantized GEMM kernels.\
   Will be disabled if not supported by the platform"
-<<<<<<< HEAD
-  OFF
-  "USE_CUDA OR USE_ROCM"
-=======
   ${USE_FBGEMM_GENAI_DEFAULT}
   "(USE_CUDA AND NOT MSVC) OR USE_ROCM"
->>>>>>> upstream/main
   OFF)
 
 

requirements-build.txt

@@ -1,5 +1,4 @@
 # Build System requirements
-<<<<<<< HEAD
 setuptools>=70.1.0,<80.0  # setuptools develop deprecated on 80.0
 cmake>=3.31.4
 ninja==1.11.1.3
@@ -10,15 +9,4 @@ pyyaml==6.0.2
 requests==2.32.4
 six==1.17.0  # dependency chain: NNPACK -> PeachPy -> six
 typing-extensions==4.14.1
-=======
-setuptools>=70.1.0
-cmake>=3.27
-ninja
-numpy
-packaging
-pyyaml
-requests
-six  # dependency chain: NNPACK -> PeachPy -> six
-typing-extensions>=4.10.0
->>>>>>> upstream/main
 pip  # not technically needed, but this makes setup.py invocation work