MacOs versioning and release bugfix (#247)

Author: vmoens

.circleci/unittest/linux/scripts/environment.yml

@@ -17,6 +17,7 @@ dependencies:
     - pytest
     - pytest-cov
     - pytest-mock
+    - pytest-instafail
     - expecttest
     - pyyaml
     - scipy

.circleci/unittest/linux/scripts/run_test.sh

@@ -16,7 +16,8 @@ lib_dir="${env_dir}/lib"
 
 # solves ImportError: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.21' not found
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir
+export MKL_THREADING_LAYER=GNU
 
 pytest test/smoke_test.py -v --durations 20
 pytest test/smoke_test_deps.py -v --durations 20
-pytest -v --durations 20
+pytest --instafail -v --durations 20

.circleci/unittest/linux_optdeps/scripts/environment.yml

@@ -10,6 +10,7 @@ dependencies:
     - pytest
     - pytest-cov
     - pytest-mock
+    - pytest-instafail
     - expecttest
     - pyyaml
     - scipy

.circleci/unittest/linux_optdeps/scripts/run_test.sh

@@ -14,5 +14,7 @@ export MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1
 export MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210
 export DISPLAY=unix:0.0
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/project/.mujoco/mujoco210/bin
+export MKL_THREADING_LAYER=GNU
+
 #MUJOCO_GL=glfw pytest --cov=torchrl --junitxml=test-results/junit.xml -v --durations 20
-MUJOCO_GL=egl pytest -v --durations 20
+MUJOCO_GL=egl pytest --instafail -v --durations 20

.circleci/unittest/linux_stable/scripts/environment.yml

@@ -18,6 +18,7 @@ dependencies:
     - pytest
     - pytest-cov
     - pytest-mock
+    - pytest-instafail
     - expecttest
     - pyyaml
     - scipy

.circleci/unittest/linux_stable/scripts/run_test.sh

@@ -16,7 +16,8 @@ lib_dir="${env_dir}/lib"
 
 # solves ImportError: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.21' not found
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$lib_dir
+export MKL_THREADING_LAYER=GNU
 
 pytest test/smoke_test.py -v --durations 20
 pytest test/smoke_test_deps.py -v --durations 20
-pytest -v --durations 20
+pytest --instafail -v --durations 20

.github/workflows/wheels.yml

@@ -27,7 +27,7 @@ jobs:
         run: |
           export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH"
           python3 -mpip install wheel
-          VERSION_TAG=${{ matrix.cuda_support[0] }} PYTORCH_CUDA_RESTRICTIONS=${{ matrix.cuda_support[2] }} python3 setup.py bdist_wheel
+          BUILD_VERSION=0.0.1 python3 setup.py bdist_wheel
           # NB: wheels have the linux_x86_64 tag so we rename to manylinux1
           # find . -name 'dist/*whl' -exec bash -c ' mv $0 ${0/linux/manylinux1}' {} \;
       # pytorch/pytorch binaries are also manylinux_2_17 compliant but they
@@ -68,7 +68,7 @@ jobs:
         run: |
           export CC=clang CXX=clang++
           python3 -mpip install wheel
-          python3 setup.py bdist_wheel
+          BUILD_VERSION=0.0.1 python3 setup.py bdist_wheel
       - name: Upload wheel for the test-wheel job
         uses: actions/upload-artifact@v2
         with:

setup.py

@@ -165,7 +165,7 @@ def _main():
             "dm_control": ["dm_control"],
             "gym_continuous": ["mujoco-py", "mujoco"],
             "rendering": ["moviepy"],
-            "tests": ["pytest", "pyyaml"],
+            "tests": ["pytest", "pyyaml", "pytest-instafail"],
             "utils": [
                 "tensorboard",
                 "tqdm",
@@ -186,4 +186,5 @@ def _main():
 
     write_version_file()
     print("Building wheel {}-{}".format(package_name, version))
+    print(f"BUILD_VERSION is {os.getenv('BUILD_VERSION')}")
     _main()

test/test_shared.py

@@ -22,6 +22,8 @@ def remote_process(command_pipe_child, command_pipe_parent, tensordict):
         tensordict.zero_()
         print(f"zeroing time: {time.time() - t0}")
         command_pipe_child.send("done")
+        command_pipe_child.close()
+        del command_pipe_child, command_pipe_parent, tensordict
 
     @staticmethod
     def driver_func(subtd, td):
@@ -39,10 +41,12 @@ def driver_func(subtd, td):
 
         for key, item in td[0].items():
             assert (item == 0).all()
-        proc.join()
         command_pipe_parent.close()
+        proc.join()
+        del command_pipe_child, command_pipe_parent, proc
 
-    def test_shared(self):
+    @pytest.mark.parametrize("indexing_method", range(3))
+    def test_shared(self, indexing_method):
         torch.manual_seed(0)
         tensordict = TensorDict(
             source={
@@ -53,31 +57,21 @@ def test_shared(self):
             batch_size=[1000],
         )
 
-        td1 = tensordict.clone().share_memory_()
-        td2 = tensordict.clone().share_memory_()
-        td3 = tensordict.clone().share_memory_()
-        subtd2 = TensorDict(
-            source={key: item[0] for key, item in td2.items()}, batch_size=[]
-        )
-        assert subtd2.is_shared()
-        print("sub td2 is shared: ", subtd2.is_shared())
-
-        subtd1 = td1.get_sub_tensordict(0)
-        t0 = time.time()
-        self.driver_func(subtd1, td1)
-        t_elapsed = time.time() - t0
-        print(f"execution on subtd: {t_elapsed}")
+        td = tensordict.clone().share_memory_()
+        if indexing_method == 0:
+            subtd = TensorDict(
+                source={key: item[0] for key, item in td.items()}, batch_size=[]
+            )
+        elif indexing_method == 1:
+            subtd = td.get_sub_tensordict(0)
+        elif indexing_method == 2:
+            subtd = td[0]
+        else:
+            raise NotImplementedError
 
-        t0 = time.time()
-        self.driver_func(subtd2, td2)
-        t_elapsed = time.time() - t0
-        print(f"execution on plain td: {t_elapsed}")
+        assert subtd.is_shared()
 
-        subtd3 = td3[0]
-        t0 = time.time()
-        self.driver_func(subtd3, td3)
-        t_elapsed = time.time() - t0
-        print(f"execution on regular indexed td: {t_elapsed}")
+        self.driver_func(subtd, td)
 
 
 class TestStack:
@@ -102,6 +96,8 @@ def remote_process(command_pipe_child, command_pipe_parent, tensordict):
                 tensordict.update_at_(td, i)
         time_spent = time.time() - t0
         command_pipe_child.send(time_spent)
+        command_pipe_child.close()
+        del command_pipe_child, command_pipe_parent
 
     @staticmethod
     def driver_func(td, stack):