Restoring tox.ini and .github/workflows/tensorflow.yml to reverse cha…

…nges done to run CI on a specific dataloader branch
NVIDIA-Merlin · Mar 20, 2023 · 8ecefb1 · 8ecefb1
1 parent 054bcf2
commit 8ecefb1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/.github/workflows/tensorflow.yml b/.github/workflows/tensorflow.yml
@@ -43,14 +43,12 @@ jobs:
           fi
           pip install "pandas>=1.2.0,<1.4.0dev0"
           pip install "NVTabular@git+https://github.com/NVIDIA-Merlin/NVTabular.git@$branch"
-          #pip install "merlin-dataloader@git+https://github.com/NVIDIA-Merlin/dataloader.git@$branch"
-          pip install merlin-dataloader@git+https://github.com/bschifferer/dataloader.git@change_output
+          pip install "merlin-dataloader@git+https://github.com/NVIDIA-Merlin/dataloader.git@$branch"          
           pip install "merlin-core@git+https://github.com/NVIDIA-Merlin/core.git@$branch"
       - name: Install dependencies
         run: |
           python -m pip install "tensorflow${{ matrix.tensorflow-version }}"
-          python -m pip install .[tensorflow-dev]
-          pip install merlin-dataloader@git+https://github.com/bschifferer/dataloader.git@change_output
+          python -m pip install .[tensorflow-dev]          
       - name: Build
         run: |
           python setup.py develop
@@ -100,14 +98,12 @@ jobs:
           fi
           pip install "pandas>=1.2.0,<1.4.0dev0"
           pip install "NVTabular@git+https://github.com/NVIDIA-Merlin/NVTabular.git@$branch"
-          #pip install "merlin-dataloader@git+https://github.com/NVIDIA-Merlin/dataloader.git@$branch"
-          pip install merlin-dataloader@git+https://github.com/bschifferer/dataloader.git@change_output
+          pip install "merlin-dataloader@git+https://github.com/NVIDIA-Merlin/dataloader.git@$branch"          
           pip install "merlin-core@git+https://github.com/NVIDIA-Merlin/core.git@$branch"
       - name: Install dependencies
         run: |
           python -m pip install "tensorflow${{ matrix.tensorflow-version }}"
-          python -m pip install .[tensorflow-dev]
-          pip install merlin-dataloader@git+https://github.com/bschifferer/dataloader.git@change_output
+          python -m pip install .[tensorflow-dev]          
       - name: Build
         run: |
           python setup.py develop

diff --git a/tox.ini b/tox.ini
@@ -20,11 +20,8 @@ setenv =
 sitepackages=true
 commands =
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
-    # Enforcing the PR that implements the dataloader features changes
-    #python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
+    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
     python -m pytest --cov-report term --cov merlin -rxs tests/unit/
 
 [testenv:py38-multi-gpu]
@@ -41,10 +38,8 @@ setenv =
 sitepackages=true
 commands =
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
-    #python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
+    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
     horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh python -m pytest -m horovod -rxs tests/unit
 
 [testenv:py38-horovod-cpu]
@@ -59,10 +54,8 @@ commands =
     {envdir}/env/bin/python -m pip install horovod --no-cache-dir
     {envdir}/env/bin/horovodrun --check-build
     {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git
-    #{envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
-    {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
-    {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git
-    {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
+    {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git    
+    {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git    
     {envdir}/env/bin/horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh pytest -m horovod -rxs tests/unit
 
 [testenv:py38-nvtabular-cpu]
@@ -77,10 +70,8 @@ commands =
     python -m pip install --upgrade "./nvtabular-{env:GIT_COMMIT}"
     python -m pip install --upgrade -r "./nvtabular-{env:GIT_COMMIT}/requirements/test.txt"
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
-    #python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}    
-    python -m pip install .
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
+    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}    
+    python -m pip install .    
     python -m pytest nvtabular-{env:GIT_COMMIT}/tests/unit
 
 [testenv:py38-systems-cpu]
@@ -95,11 +86,9 @@ commands =
     python -m pip install --upgrade "./systems-{env:GIT_COMMIT}"
     python -m pip install --upgrade -r "./systems-{env:GIT_COMMIT}/requirements/test-cpu.txt"
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git@{posargs:main}
-    #python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output    
+    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git@{posargs:main}
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/NVTabular.git@{posargs:main}
     python -m pip install .
-    python -m pip install --upgrade git+https://github.com/bschifferer/dataloader.git@change_output
     python -m pytest -m "not notebook" systems-{env:GIT_COMMIT}/tests/unit
 
 [testenv:docs]
@@ -113,7 +102,6 @@ commands =
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git
-    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
     python -m sphinx.cmd.build -E -P -b html docs/source docs/build/html
 
 [testenv:docs-multi]
@@ -125,6 +113,5 @@ commands =
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/core.git
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git
-    python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/dataloader.git
     sphinx-multiversion --dump-metadata docs/source docs/build/html | jq "keys"
     sphinx-multiversion docs/source docs/build/html