Skip to content

Commit

Permalink
extend support to py312 (#829)
Browse files Browse the repository at this point in the history
* python version control for wheels generation

Signed-off-by: Clement Fuji Tsang <cfujitsang@nvidia.com>

* .

Signed-off-by: Clement Fuji Tsang <cfujitsang@nvidia.com>

* update version to v0.17.0a0

Signed-off-by: Clement Fuji Tsang <cfujitsang@nvidia.com>

---------

Signed-off-by: Clement Fuji Tsang <cfujitsang@nvidia.com>
  • Loading branch information
Caenorst authored Sep 18, 2024
1 parent 3a25411 commit 859cf2a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions ci/gitlab_jenkins_templates/core_ci.jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import groovy.transform.Field
if (gitlabActionType == "MERGE" || gitlabSourceBranch == "master") {
gitlabCommitStatus("launch all builds") {

def defaultWheelsPythonVers = ['3.9', '3.10', '3.11', '3.12']

// Configs for build from pytorch docker images
// (See: https://hub.docker.com/r/pytorch/pytorch/tags)
Expand Down Expand Up @@ -71,7 +72,7 @@ def ubuntu_for_cuda_wheels_configs = [
/*
[
'cudaVer': '11.7.1', 'cudnnVer': '8',
'torchVer': '2.0.0', 'archsToTest': 'MULTI'
'torchVer': '2.0.0', 'archsToTest': 'MULTI',
],
[
'cudaVer': '11.8.0', 'cudnnVer': '8',
Expand Down Expand Up @@ -149,11 +150,11 @@ def ubuntu_for_cuda_wheels_configs = [
'cudaVer': '12.1.0', 'cudnnVer': '8',
'torchVer': '2.4.0', 'archsToTest': 'MULTI'
],
*/
[
'cudaVer': '12.4.1', 'cudnnVer': '',
'torchVer': '2.4.0', 'archsToTest': 'MULTI'
]
*/
]

def ubuntu_for_cpu_wheels_configs = [
Expand Down Expand Up @@ -313,6 +314,7 @@ def windows_for_cpu_wheels_configs = [
[
'torchVer': '2.4.0', 'archsToTest': ''
]
*/
]
// Configs for build from Windows server docker images
// (See: https://hub.docker.com/_/microsoft-dotnet-framework-sdk)
Expand Down Expand Up @@ -362,7 +364,8 @@ node {
if (gitlabActionType == "MERGE" &&
gitlabMergeRequestTitle.contains("[for wheels]")) {
for (config in ubuntu_for_cuda_wheels_configs) {
for (pythonVer in ['3.9', '3.10', '3.11']) {
pythonVers = config.containsKey('pythonVers') && config.containsKey != '' ? config['pythonVers'] : defaultWheelsPythonVers
for (pythonVer in pythonVers) {
def configName = "custom-wheels-torch${config['torchVer']}-" + \
"cuda${config['cudaVer']}-" +
"cudnn${config['cudnnVer']}-" +
Expand All @@ -379,7 +382,8 @@ node {
}
}
for (config in ubuntu_for_cpu_wheels_configs) {
for (pythonVer in ['3.9', '3.10', '3.11']) {
pythonVers = config.containsKey('pythonVers') && config.containsKey != '' ? config['pythonVers'] : defaultWheelsPythonVers
for (pythonVer in pythonVers) {
def configName = "custom-wheels-torch${config['torchVer']}-" + \
"cpu-py${pythonVer}"
jobMap["${configName}"] = prepareUbuntuCPUOnlyJob(
Expand All @@ -391,7 +395,8 @@ node {
}
}
for (config in windows_for_cuda_wheels_configs) {
for (pythonVer in ['3.9', '3.10', '3.11']) {
pythonVers = config.containsKey('pythonVers') && config.containsKey != '' ? config['pythonVers'] : defaultWheelsPythonVers
for (pythonVer in pythonVers) {
def cudaVerLabel = config['cudaVer'].split('\\.').join('')
def torchVerLabel = config['torchVer'].split('\\.').join('')
def pythonVerLabel = pythonVer.split('\\.').join('')
Expand All @@ -407,7 +412,8 @@ node {
}
}
for (config in windows_for_cpu_wheels_configs) {
for (pythonVer in ['3.9', '3.10', '3.11']) {
pythonVers = config.containsKey('pythonVers') && config.containsKey != '' ? config['pythonVers'] : defaultWheelsPythonVers
for (pythonVer in pythonVers) {
def torchVerLabel = config['torchVer'].split('\\.').join('')
def pythonVerLabel = pythonVer.split('\\.').join('')
def configName = "windows-wheels-cpu-py${pythonVerLabel}-torch${torchVerLabel}"
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.16.0
0.17.0a0

0 comments on commit 859cf2a

Please sign in to comment.