Add patch for test_dataloader

Author: Flamefire

easybuild/easyconfigs/p/PyTorch/PyTorch-1.6.0-fosscuda-2019b-Python-3.7.4.eb

@@ -202,6 +202,7 @@ patches = [
     '%(name)s-1.4.0_fix-system-pybind11.patch',
     '%(name)s-1.6.0_fix-missing-source-dir.patch',
     '%(name)s-1.6.0_fix-test-cuda.patch',
+    '%(name)s-1.6.0_fix-test-dataloader-fixed-affinity.patch',
     '%(name)s-1.6.0_fix-test-tensorexpr.patch',
     '%(name)s-1.6.0_fix-test-missing-rpc-shutdown.patch',
     '%(name)s-1.6.0_fix-rpc-test-world-size.patch',
@@ -245,6 +246,8 @@ checksums = [
     '1c9f36f959ea5d7cf0d4ca678ec6bf60ef9ed16c556f97197aa018c7b1e5e21d',  # PyTorch-1.4.0_fix-system-pybind11.patch
     'f3725477d554800a19a8d7f4ab300ab7b70da76b62328081c0ed1f8517c6a61c',  # PyTorch-1.6.0_fix-missing-source-dir.patch
     'adf21e77dbc5e60fd46fe21fceb908633b0da7d4fc9b6a3ea7f7cfb0c4a44678',  # PyTorch-1.6.0_fix-test-cuda.patch
+    # PyTorch-1.6.0_fix-test-dataloader-fixed-affinity.patch
+    'a4208a46cd2098744daaba96cebb96cd91166f8fc616924315e05974bad80c67',
     '37c19e286f4090115bc67989e537241f2988041ef5c3ff6d02d8c736d8703090',  # PyTorch-1.6.0_fix-test-tensorexpr.patch
     # PyTorch-1.6.0_fix-test-missing-rpc-shutdown.patch
     '9afd9b3a85a7b115e9535cf6a618d5dd137a69a5f36747d6290ac3bf123ab896',

easybuild/easyconfigs/p/PyTorch/PyTorch-1.6.0_fix-test-dataloader-fixed-affinity.patch

@@ -0,0 +1,48 @@
+From c7c7460fd3a49a9d289394b80d9ecf61898edf49 Mon Sep 17 00:00:00 2001
+From: Alexander Grund <[email protected]>
+Date: Wed, 9 Sep 2020 08:47:03 +0200
+Subject: [PATCH] Choose test affinity based on current affinity
+
+---
+ test/test_dataloader.py | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/test/test_dataloader.py b/test/test_dataloader.py
+index ca0c9e6cb511f..745942bcf01f2 100644
+--- a/test/test_dataloader.py
++++ b/test/test_dataloader.py
+@@ -2128,22 +2128,28 @@ def __iter__(self):
+         after = os.sched_getaffinity(0)
+         return iter(after)
+ 
+-
+-def worker_set_affinity(_):
+-    os.sched_setaffinity(0, [2])
+-
+-
+ @unittest.skipIf(
+     not hasattr(os, 'sched_setaffinity'),
+     "os.sched_setaffinity is not available")
+ class TestSetAffinity(TestCase):
+     def test_set_affinity_in_worker_init(self):
++        # Query the current affinity mask to avoid setting a disallowed one
++        old_affinity = os.sched_getaffinity(0)
++        if not old_affinity:
++            self.skipTest("No affinity information")
++        # Choose any
++        expected_affinity = list(old_affinity)[-1]
++
++        def worker_set_affinity(_):
++            os.sched_setaffinity(0, [expected_affinity])
++
++
+         dataset = SetAffinityDataset()
+ 
+         dataloader = torch.utils.data.DataLoader(
+             dataset, num_workers=2, worker_init_fn=worker_set_affinity)
+         for sample in dataloader:
+-            self.assertEqual(sample, [2])
++            self.assertEqual(sample, [expected_affinity])
+ 
+ 
+