Merge branch 'master' into patch_2025_07_22

Author: Narrohag

pytorch/training/docker/2.7/py3/cu128/Dockerfile.gpu

@@ -150,7 +150,7 @@ RUN mkdir -p /tmp/nvjpeg \
 #  -l, --skip-limit-conf Skip EFA limit configuration
 #  -k, --skip-kmod       Skip EFA kmod installation
 # start from 0.38.0 EFA now bundles the AWS OFI NCCL plugin, 
-# which can now be found in /opt/amazon/ofi-nccl rather than the original /opt/aws-ofi-nccl/.
+# which can now be found in /opt/amazon/ofi-nccl/lib/x86_64-linux-gnu rather than the original /opt/aws-ofi-nccl/.
 RUN mkdir /tmp/efa \
  && cd /tmp/efa \
  && curl -O https://s3-us-west-2.amazonaws.com/aws-efa-installer/aws-efa-installer-${EFA_VERSION}.tar.gz \

test/sagemaker_tests/huggingface_pytorch/training/requirements.txt

@@ -9,12 +9,12 @@ docker-compose
 flake8==3.7.7
 Flask==1.1.1
 mock
-pytest
+pytest==8.4.1
 pytest-cov
 pytest-rerunfailures
 pytest-xdist
 requests==2.31.0
-pluggy<1,>=0.3.0
+pluggy<2,>=0.3.0
 requests_mock
 fabric
 invoke