Skip to content

Commit

Permalink
Update dependencies (#5349)
Browse files Browse the repository at this point in the history
* Update cutlass 3.4.0 -> 3.4.1
* Update rapidjson to HEAD
* black  24.1.1 -> 24.2.0
* Update DALI_DEPS_VERSION
* Update readme

Signed-off-by: Krzysztof Lecki <[email protected]>
  • Loading branch information
klecki authored Mar 5, 2024
1 parent e0f6a27 commit 67e1431
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: pip install flake8 "black[jupyter]"==24.1.1
- run: pip install flake8 "black[jupyter]"==24.2.0
- run: black --check --verbose ${{ env.PYTHON_LINT_PATHS }} ${{ env.AUTOGRAPH_LINT_PATHS }}
- run: flake8 --config=.flake8 ${{ env.PYTHON_LINT_PATHS }}
- run: flake8 --config=.flake8.ag ${{ env.AUTOGRAPH_LINT_PATHS }}
Expand Down
2 changes: 1 addition & 1 deletion DALI_DEPS_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
df4a84e20b4133442f3f2e03d6f80422d2d81f35
4ee4e28d0c5bf80d6e94c40ef6b362d3b4e654bb
4 changes: 2 additions & 2 deletions conda/dali_python_bindings/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ requirements:
- astunparse >=1.6.0
- gast >=0.3.3
- dm-tree >=0.1.8
- black =24.1.1
- black-jupyter =24.1.1
- black =24.2.0
- black-jupyter =24.2.0
- nvidia-dali-core{% if environ.get('NVIDIA_DALI_BUILD_FLAVOR', '')|length %}{{"-" + environ.get('NVIDIA_DALI_BUILD_FLAVOR', '')}}{% endif %}-cuda{{ environ.get('CUDA_VERSION', '') | replace(".","") }} ={{ environ.get('DALI_CONDA_BUILD_VERSION', '') }}
host:
- dali-opencv
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV PYVER=${PYVER} \
RUN ln -s /opt/python/cp${PYV}* /opt/python/v

# install Python bindings and patch it to use the clang we have here
RUN pip install future setuptools wheel clang==14.0 flake8 astunparse gast dm-tree "black[jupyter]"==24.1.1 && \
RUN pip install future setuptools wheel clang==14.0 flake8 astunparse gast dm-tree "black[jupyter]"==24.2.0 && \
PY_CLANG_PATH=$(echo $(pip show clang) | sed 's/.*Location: \(.*\) Requires.*/\1/')/clang/cindex.py && \
LIBCLANG_PATH=/usr/local/lib/libclang.so && \
sed -i "s|library_file = None|library_file = \"${LIBCLANG_PATH}\"|" ${PY_CLANG_PATH} && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.build.aarch64-linux
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/
curl -O https://bootstrap.pypa.io/get-pip.py; \
fi && python3 get-pip.py && rm get-pip.py && \
# decouple libclang and clang installation so libclang changes are not overriden by clang
pip install clang==14.0 && pip install libclang==14.0.1 flake8 "black[jupyter]"==24.1.1 && \
pip install clang==14.0 && pip install libclang==14.0.1 flake8 "black[jupyter]"==24.2.0 && \
rm -rf /root/.cache/pip/ && \
cd /tmp && git clone https://github.com/NixOS/patchelf && cd patchelf && \
./bootstrap.sh && ./configure --prefix=/usr/ && make -j install && cd / && rm -rf /tmp/patchelf && \
Expand Down
12 changes: 6 additions & 6 deletions third_party/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ This part of the repository contains extra dependencies required to build DALI,

.. |cutlass| replace:: CUTLASS
.. _cutlass: https://github.com/NVIDIA/cutlass
.. |cutlassver| replace:: 3.4.0
.. _cutlassver: https://github.com/NVIDIA/cutlass/tree/v3.4.0
.. |cutlassver| replace:: 3.4.1
.. _cutlassver: https://github.com/NVIDIA/cutlass/tree/v3.4.1
.. |cutlasslic| replace:: BSD 3-Clause License
.. _cutlasslic: https://github.com/NVIDIA/cutlass/blob/master/LICENSE.txt

Expand Down Expand Up @@ -84,14 +84,14 @@ This part of the repository contains extra dependencies required to build DALI,

.. |rapidjson| replace:: RapidJSON
.. _rapidjson: https://github.com/Tencent/rapidjson
.. |rapidjsonver| replace:: Top-of-tree (Dec 6, 2023)
.. _rapidjsonver: https://github.com/Tencent/rapidjson/commit/6089180ecb704cb2b136777798fa1be303618975
.. |rapidjsonver| replace:: Top-of-tree (Feb 9, 2024)
.. _rapidjsonver: https://github.com/Tencent/rapidjson/commit/3f73edae00aba5b0112a80b4d41e6f1ff7d92a3d
.. |rapidjsonlic| replace:: MIT License, BSD 3-Clause License, JSON License
.. _rapidjsonlic: https://github.com/Tencent/rapidjson/blob/master/license.txt

.. |black| replace:: black
.. _black: https://github.com/psf/black
.. |blackver| replace:: 24.1.1
.. _blackver: https://pypi.org/project/black/24.1.1/
.. |blackver| replace:: 24.2.0
.. _blackver: https://pypi.org/project/black/24.2.0/
.. |blacklic| replace:: MIT License
.. _blacklic: https://github.com/psf/black/blob/main/LICENSE
2 changes: 1 addition & 1 deletion third_party/cutlass
Submodule cutlass updated 61 files
+7 −2 CHANGELOG.md
+24 −3 CMakeLists.txt
+7 −0 PUBLICATIONS.md
+9 −4 README.md
+0 −38 cmake/version.h.in
+34 −0 cmake/version_extended.h.in
+1 −0 examples/02_dump_reg_shmem/CMakeLists.txt
+2 −2 examples/08_turing_tensorop_gemm/turing_tensorop_gemm.cu
+7 −7 examples/56_hopper_ptr_array_batched_gemm/56_hopper_ptr_array_batched_gemm.cu
+10 −8 examples/56_hopper_ptr_array_batched_gemm/CMakeLists.txt
+96 −49 examples/57_hopper_grouped_gemm/57_hopper_grouped_gemm.cu
+10 −0 examples/57_hopper_grouped_gemm/CMakeLists.txt
+1 −1 include/cute/arch/copy_sm90_desc.hpp
+2 −0 include/cute/atom/mma_atom.hpp
+2 −2 include/cute/util/print.hpp
+3 −0 include/cute/util/type_traits.hpp
+4 −0 include/cutlass/arch/mma_sm90.h
+1 −0 include/cutlass/bfloat16.h
+35 −1 include/cutlass/detail/layout.hpp
+12 −7 include/cutlass/epilogue/collective/builders/sm90_builder.inl
+1 −0 include/cutlass/epilogue/collective/default_epilogue.hpp
+32 −18 include/cutlass/epilogue/collective/default_epilogue_array.hpp
+76 −38 include/cutlass/epilogue/collective/sm90_epilogue_tma_warpspecialized.hpp
+1 −2 include/cutlass/epilogue/dispatch_policy.hpp
+28 −0 include/cutlass/epilogue/fusion/sm90_callbacks_tma_warpspecialized.hpp
+1 −0 include/cutlass/epilogue/fusion/sm90_visitor_store_tma_warpspecialized.hpp
+57 −12 include/cutlass/epilogue/thread/linear_combination.h
+0 −183 include/cutlass/epilogue/threadblock/default_epilogue_tensor_op_row_broadcast.h
+0 −519 include/cutlass/epilogue/threadblock/predicated_tile_iterator_row_broadcast.h
+4 −8 include/cutlass/gemm/collective/builders/sm90_gmma_builder.inl
+45 −29 include/cutlass/gemm/collective/sm90_mma_array_tma_gmma_ss_warpspecialized.hpp
+0 −514 include/cutlass/gemm/device/gemm_sparse_row_broadcast.h
+4 −7 include/cutlass/gemm/dispatch_policy.hpp
+12 −0 include/cutlass/gemm/group_array_problem_shape.hpp
+0 −191 include/cutlass/gemm/kernel/default_gemm_sparse_row_broadcast.h
+30 −35 include/cutlass/gemm/kernel/sm90_gemm_array_tma_warpspecialized_cooperative.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_tma.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_tma_warpspecialized.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_tma_warpspecialized_cooperative.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_tma_warpspecialized_pingpong.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_warpspecialized.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_warpspecialized_cooperative.hpp
+5 −7 include/cutlass/gemm/kernel/sm90_gemm_warpspecialized_pingpong.hpp
+140 −86 include/cutlass/gemm/kernel/sm90_tile_scheduler_group.hpp
+0 −400 include/cutlass/gemm/kernel/sparse_gemm_row_broadcast.h
+14 −6 include/cutlass/gemm/kernel/tile_scheduler_params.h
+80 −0 include/cutlass/version.h
+2 −2 pyproject.toml
+3 −3 python/cutlass/__init__.py
+6 −2 python/cutlass/backend/c_types.py
+23 −1 python/cutlass/backend/epilogue.py
+2 −2 python/cutlass/backend/evt/frontend/frontend_base.py
+0 −16 python/cutlass/backend/evt/passes/graph_drawer.py
+28 −18 python/cutlass/backend/gemm_operation.py
+1 −1 python/setup_library.py
+1 −1 python/setup_pycute.py
+1 −0 test/unit/gemm/device/CMakeLists.txt
+0 −19 test/unit/gemm/device/gemm_f16n_f16n_f16t_tensor_op_f32_sparse_sm80.cu
+685 −0 test/unit/gemm/device/sm90_gemm_f16_f16_f16_tensor_op_f32_cluster_warpspecialized_cooperative_aux_store.cu
+7 −20 test/unit/gemm/device/testbed_sparse.h
+1 −1 tools/util/include/cutlass/util/packed_stride.hpp
2 changes: 1 addition & 1 deletion third_party/rapidjson

0 comments on commit 67e1431

Please sign in to comment.