Skip to content

Commit

Permalink
Dependency update Nov 2021 (#3523)
Browse files Browse the repository at this point in the history
* Bump DALI_deps SHA. 
* Bump libjpeg_turbo in conda to 2.1.1 - the latest version supported by conda forge.
* Remove unused submodule 'thrust'
* Remove thrust from README

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
  • Loading branch information
mzient committed Nov 25, 2021
1 parent a877b53 commit e07036f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Expand Up @@ -26,9 +26,6 @@
[submodule "third_party/cocoapi"]
path = third_party/cocoapi
url = https://github.com/cocodataset/cocoapi
[submodule "third_party/thrust"]
path = third_party/thrust
url = https://github.com/NVIDIA/thrust
[submodule "third_party/libcudacxx"]
path = third_party/libcudacxx
url = https://github.com/mzient/libcudacxx.git
2 changes: 1 addition & 1 deletion DALI_DEPS_VERSION
@@ -1 +1 @@
ed4f3ed4ed73adbb01d8c17ba43d747549172e90
051d575ee0989ef8448188387a7f596e8ed90515
4 changes: 2 additions & 2 deletions conda/recipe/meta.yaml
Expand Up @@ -72,7 +72,7 @@ requirements:
# in the dependency tree
- protobuf >=3.18.0
- libprotobuf-static >=3.18.0
- libjpeg-turbo >=2.1.0
- libjpeg-turbo >=2.1.1
- tensorflow-gpu =2.2.0
- tensorflow-estimator =2.2.0
- tensorboard =2.2.2
Expand All @@ -91,7 +91,7 @@ requirements:
run:
- python
- future >=0.17.1
- libjpeg-turbo >=2.1.0
- libjpeg-turbo >=2.1.1
- tensorflow-gpu =2.2.0
- tensorflow-estimator =2.2.0
- tensorboard =2.2.2
Expand Down
9 changes: 0 additions & 9 deletions third_party/README.rst
Expand Up @@ -25,8 +25,6 @@ This part of the repository contains extra dependencies required to build DALI,
+-----------------+---------------------+---------------------+
| |rapidjson|_ | |rapidjsonver|_ | |rapidjsonlic|_ |
+-----------------+---------------------+---------------------+
| |thrust|_ | |thrustver|_ | |thrustlic|_ |
+-----------------+---------------------+---------------------+

.. |benchmark| replace:: Google Benchmark
.. _benchmark: https://github.com/google/benchmark
Expand Down Expand Up @@ -97,10 +95,3 @@ This part of the repository contains extra dependencies required to build DALI,
.. _rapidjsonver: https://github.com/Tencent/rapidjson/tree/4d6cb08189cf7336821f04090b612baa2ca6a90d
.. |rapidjsonlic| replace:: MIT License, BSD 3-Clause License, JSON License
.. _rapidjsonlic: https://github.com/Tencent/rapidjson/blob/master/license.txt

.. |thrust| replace:: Thrust
.. _thrust: https://github.com/NVIDIA/thrust
.. |thrustver| replace:: 1.14.0
.. _thrustver: https://github.com/NVIDIA/thrust/releases/tag/1.14.0
.. |thrustlic| replace:: Apache License 2.0
.. _thrustlic: https://github.com/NVIDIA/thrust/blob/main/LICENSE
1 change: 0 additions & 1 deletion third_party/thrust
Submodule thrust deleted from e20487

0 comments on commit e07036f

Please sign in to comment.