Skip to content

Commit ca6cb6a

Browse files
committed
[actions] Use stable OpenCV and expand PTX architectures
1 parent fb829bc commit ca6cb6a

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

.github/workflows/build_wheels_windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ on:
2424
required: false
2525
type: boolean
2626
default: true
27+
rolling_build:
28+
description: "Use latest commit from upstream OpenCV repo."
29+
required: false
30+
type: boolean
31+
default: false
2732

2833

2934
jobs:
@@ -39,6 +44,7 @@ jobs:
3944
SDIST: 0
4045
ENABLE_HEADLESS: 0
4146
ENABLE_CONTRIB: 1
47+
ENABLE_ROLLING: ${{ inputs.rolling_build && 1 || 0 }}
4248
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
4349
steps:
4450
- name: Cleanup
@@ -47,12 +53,6 @@ jobs:
4753
rm -rf ./* || true
4854
rm -rf ./.??* || true
4955
working-directory: ${{ github.workspace }}
50-
- name: Setup environment
51-
shell: bash
52-
run: |
53-
if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
54-
echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
55-
fi
5656
- name: Checkout
5757
uses: actions/checkout@v4
5858
with:

find_version.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
print(e.output)
5454
raise
5555

56+
57+
# TODO(@Breakthrough): Update this so that we just use the tag name directly as the version
58+
# identifier. We might need to strip off a "v" suffix if we include that in the repo, but it
59+
# will greatly simplify things. This can also get out of sync since we cache artifacts now.
60+
# Move invoking this script to the builder!
61+
5662
if len(tag) == 1:
5763
# tag identifies the build and should be a sequential revision number
5864
version = tag[0]

setup.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def main():
1717
CI_BUILD = os.environ.get("CI_BUILD", "False")
1818
is_CI_build = True if CI_BUILD == "1" else False
1919
cmake_source_dir = "opencv"
20-
minimum_supported_numpy = "1.13.3"
2120
build_contrib = get_build_env_var_by_name("contrib")
2221
build_headless = get_build_env_var_by_name("headless")
2322
build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
@@ -151,8 +150,19 @@ def main():
151150

152151
cudnn_library = os.environ["CUDNN_LIBRARY"]
153152
cudnn_include_dir = os.environ["CUDNN_INCLUDE_DIR"]
154-
cuda_arch_bin = "6.0;6.1;7.0;7.5"
155-
cuda_arch_ptx = "7.5"
153+
154+
# fermi = "2.0"
155+
# kepler = "3.0;3.5;3.7"
156+
# maxwell = "5.0;5.2"
157+
# pascal = "6.0;6.1"
158+
# volta = "7.0"
159+
# turing = "7.5"
160+
# ampere = "8.0;8.6"
161+
# lovelace = "8.9"
162+
# hopper = "9.0"
163+
# blackwell = "10.0;12.0"
164+
cuda_arch_bin = "6.0;6.1;7.0;7.5,8.0,8.4"
165+
cuda_arch_ptx = "8.4"
156166

157167
cmake_args = (
158168
(ci_cmake_generator if is_CI_build else [])

0 commit comments

Comments
 (0)