Skip to content

Commit 2daff9a

Browse files
JanuszLJanuszL
committed
Refactor package naming: move from flavor-based names to version-based dev differentiation
- Previously, weekly/nightly builds were differentiated by flavor suffix in the package name (e.g., nvidia-dali-weekly-cuda*, nvidia-dali-nightly-cuda*). This change moves to a unified naming schema where: - Package names are consistent regardless of build type (nvidia-dali-cuda*) - Dev builds are differentiated by .dev{TIMESTAMP} suffix in version number - Stable and dev packages share the same package name, distinguished only by version - Removes DALI_FLAVOR_MINUS variable from CMakeLists.txt files - Updates package names to remove flavor suffix: - nvidia-dali-cuda* (was nvidia-dali-{flavor}-cuda*) - nvidia-dali-tf-plugin-cuda* (was nvidia-dali-tf-plugin-{flavor}-cuda*) - nvidia-dali-{plugin} (was nvidia-dali-{plugin}-{flavor}) - Standardizes dev version format: use .dev{TIMESTAMP} instead of .{TIMESTAMP} - Updates install_requires in TF plugin to match new naming schema - Updates installation documentation to explain new distribution method: - Documents new unified package naming with .dev{TIMESTAMP} version suffix - Explains use of --pre flag for installing dev builds - Adds legacy distribution section for pre-1.53 builds - Clarifies nightly vs weekly build schedule and availability Signed-off-by: Janusz Lisiecki <[email protected]>
1 parent 6c4549d commit 2daff9a

File tree

7 files changed

+52
-19
lines changed

7 files changed

+52
-19
lines changed

‎dali/python/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ endif (PREBUILD_DALI_LIBS)
4141

4242
if (DALI_BUILD_FLAVOR)
4343
set(DALI_FLAVOR "${DALI_BUILD_FLAVOR} ")
44-
set(DALI_FLAVOR_MINUS "-${DALI_BUILD_FLAVOR}")
45-
set(DALI_VERSION "${DALI_VERSION}.${TIMESTAMP}")
44+
if(NOT "${DALI_VERSION}" MATCHES "dev")
45+
message(FATAL_ERROR "Development build must have 'dev' in DALI_VERSION (current value: ${DALI_VERSION})")
46+
endif()
47+
set(DALI_VERSION "${DALI_VERSION}${TIMESTAMP}")
4648
endif()
4749

4850
# Add the COPYRIGHT, LICENSE, and Acknowledgements

‎dali/python/setup.py.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from setuptools import setup, find_namespace_packages
1616

17-
setup(name='nvidia-dali@DALI_FLAVOR_MINUS@-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@',
17+
setup(name='nvidia-dali-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@',
1818
description='NVIDIA DALI @DALI_FLAVOR@ for CUDA @CUDA_VERSION_SHORT@. Git SHA: @GIT_SHA@',
1919
long_description='''NVIDIA DALI
2020
===========

‎dali_tf_plugin/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ parse_cuda_version(${CUDA_VERSION} CUDA_VERSION_MAJOR CUDA_VERSION_MINOR CUDA_VE
2828
get_dali_version(${DALI_ROOT}/VERSION DALI_VERSION)
2929
if (DALI_BUILD_FLAVOR)
3030
set(DALI_FLAVOR "${DALI_BUILD_FLAVOR} ")
31-
set(DALI_FLAVOR_MINUS "-${DALI_BUILD_FLAVOR}")
32-
set(DALI_VERSION "${DALI_VERSION}.${TIMESTAMP}")
31+
if(NOT "${DALI_VERSION}" MATCHES "dev")
32+
message(FATAL_ERROR "Development build must have 'dev' in DALI_VERSION (current value: ${DALI_VERSION})")
33+
endif()
34+
set(DALI_VERSION "${DALI_VERSION}${TIMESTAMP}")
3335
endif()
3436

3537
configure_file("${PROJECT_SOURCE_DIR}/setup.py.in" "${PROJECT_BINARY_DIR}/setup.py")

‎dali_tf_plugin/setup.py.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CustomDistribution(Distribution):
3434
# to be built for different platforms
3535
self.ext_modules = [Extension('nvidia.dali_tf_plugin', [])]
3636

37-
setup(name='nvidia-dali-tf-plugin@DALI_FLAVOR_MINUS@-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@',
37+
setup(name='nvidia-dali-tf-plugin-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@',
3838
description='NVIDIA DALI @DALI_FLAVOR@ TensorFlow plugin for CUDA @CUDA_VERSION_SHORT@. Git SHA: @GIT_SHA@',
3939
long_description='''TensorFlow plugin for NVIDIA DALI
4040
=================================
@@ -88,7 +88,7 @@ For more details please check the
8888
'Programming Language :: Python :: 3.13',
8989
],
9090
install_requires = [
91-
'nvidia-dali@DALI_FLAVOR_MINUS@-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@==@DALI_VERSION@',
91+
'nvidia-dali-cuda@CUDA_VERSION_SHORT_DIGIT_ONLY@==@DALI_VERSION@',
9292
'packaging',
9393
],
9494

‎docs/installation.rst‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,45 @@ pip - Nightly and Weekly Releases
130130

131131
.. note::
132132

133-
It is recommended to uninstall regular DALI and TensorFlow plugin before installing nightly or weekly
134-
builds as they are installed in the same path
133+
**New distribution method (starting from version 1.53):** Nightly and weekly builds now use the same
134+
package names as stable releases (e.g., ``nvidia-dali-cuda120``, ``nvidia-dali-cuda130``) but are
135+
differentiated by a ``.dev{TIMESTAMP}`` suffix in the version number. To install development builds,
136+
you need to specify ``--pre`` flag to allow pre-release versions and use the appropriate index URL
137+
for the nightly or weekly channel.
135138

136139
Nightly Builds
137140
^^^^^^^^^^^^^^
138141

139-
To access most recent nightly builds please use flowing release channel:
142+
Nightly builds could be published every weekday (with timestamps from Monday to Friday),
143+
while weekly builds, which undergo more extensive testing, are released on weekends
144+
(with timestamps from Saturday and Sunday). To access the latest nightly or weekly builds, use
145+
the following release channel:
146+
147+
* for CUDA 12.0:
148+
149+
.. code-block:: bash
150+
151+
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade --pre nvidia-dali-cuda120
152+
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade --pre nvidia-dali-tf-plugin-cuda120 --no-build-isolation
153+
154+
* for CUDA 13.0:
155+
156+
.. code-block:: bash
157+
158+
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade --pre nvidia-dali-cuda130
159+
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade --pre nvidia-dali-tf-plugin-cuda130 --no-build-isolation
160+
161+
Nightly and Weekly Builds - Legacy Distribution (pre-1.53)
162+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
163+
164+
.. note::
165+
166+
**Legacy distribution method:** Prior to version 1.53, nightly and weekly builds used different package
167+
names with flavor suffixes (e.g., ``nvidia-dali-nightly-cuda120``, ``nvidia-dali-weekly-cuda130``).
168+
This method is deprecated but may still be available for older versions. If you have these legacy
169+
packages installed, it is recommended to uninstall them before installing the new unified packages.
170+
171+
Legacy Nightly Builds:
140172

141173
* for CUDA 12.0:
142174

@@ -152,12 +184,7 @@ To access most recent nightly builds please use flowing release channel:
152184
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade nvidia-dali-nightly-cuda130
153185
pip install --extra-index-url https://developer.download.nvidia.com/compute/redist/nightly --upgrade nvidia-dali-tf-plugin-nightly-cuda130 --no-build-isolation
154186
155-
156-
Weekly Builds
157-
^^^^^^^^^^^^^
158-
159-
Also, there is a weekly release channel with more thorough testing. To access most recent weekly
160-
builds please use the following release channel (available only for CUDA 13):
187+
Legacy Weekly Builds (available only for CUDA 13):
161188

162189
.. code-block:: bash
163190

‎plugins/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ get_dali_version(${DALI_ROOT}/VERSION DALI_VERSION)
3333

3434
if(DALI_BUILD_FLAVOR)
3535
set(DALI_FLAVOR "${DALI_BUILD_FLAVOR} ")
36-
set(DALI_FLAVOR_MINUS "-${DALI_BUILD_FLAVOR}")
37-
set(DALI_VERSION "${DALI_VERSION}")
36+
if(NOT "${DALI_VERSION}" MATCHES "dev")
37+
message(FATAL_ERROR "Development build must have 'dev' in DALI_VERSION (current value: ${DALI_VERSION})")
38+
endif()
39+
set(DALI_VERSION "${DALI_VERSION}${TIMESTAMP}")
3840
endif()
3941

4042
add_subdirectory(video)

‎plugins/setup.py.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if __name__ == "__main__":
6363
os.environ["PYTHON_EXECUTABLE"] = sys.executable
6464

6565
skbuild.setup(
66-
name="nvidia-dali-@DALI_PLUGIN_NAME@@DALI_FLAVOR_MINUS@",
66+
name="nvidia-dali-@DALI_PLUGIN_NAME@",
6767
description="@DALI_PLUGIN_DESCRIPTION@. For NVIDIA DALI, @DALI_FLAVOR@. Git SHA: @GIT_SHA@",
6868
url='https://github.com/NVIDIA/DALI',
6969
version='@DALI_VERSION@',

0 commit comments

Comments
 (0)