Skip to content

Commit e0333b3

Browse files
committed
update release version and bump ci reqs
1 parent decf3c9 commit e0333b3

File tree

9 files changed

+31
-17
lines changed

9 files changed

+31
-17
lines changed

dockers/base-cuda/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ RUN \
7474
# set particular PyTorch version by default
7575
if [[ "${CUST_BUILD}" -eq 0 ]]; then \
7676
CUDA_VERSION_MM=${CUDA_VERSION%.*}; \
77-
uv pip install torch --prerelease=allow \
78-
--find-links="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/torch_stable.html" \
79-
--find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/torch" \
80-
--find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/pytorch-triton"; \
77+
uv pip install torch --index-url https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}; \
78+
# --find-links="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/torch_stable.html" \
79+
# --find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/torch" \
80+
# --find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/pytorch-triton"; \
8181
else \
8282
# or target a specific cuda build, by specifying a particular index url w/...
8383
# ... default channel
84-
# uv pip install torch --torch-backend=cu128; \
84+
uv pip install torch --torch-backend=cu128; \
8585
# ... pytorch nightly dev version
8686
# uv pip install --prerelease=allow torch==2.10.0.dev20251124 --index-url https://download.pytorch.org/whl/nightly/cu128; \
8787
# ... test channel
88-
uv pip install --prerelease=allow torch==2.10.0 --index-url https://download.pytorch.org/whl/test/cu128; \
88+
# uv pip install --prerelease=allow torch==2.10.0 --index-url https://download.pytorch.org/whl/test/cu128; \
8989
fi && \
9090
# We avoid installing Lightning and other dependencies here as they are usually upgraded anyway later in
9191
# CI but we may re-enable in the future.

dockers/docker_images_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ maybe_build(){
4141

4242
build_eval(){
4343
# latest PyTorch image supported by release
44-
declare -A iv=(["cuda"]="12.8.1" ["python"]="3.13" ["pytorch"]="2.10.0" ["lightning"]="2.5" ["cust_build"]="0")
44+
declare -A iv=(["cuda"]="12.8.1" ["python"]="3.13" ["pytorch"]="2.10.0" ["lightning"]="2.6" ["cust_build"]="0")
4545
export latest_pt="base-cu${iv["cuda"]}-py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}"
4646
export latest_azpl="py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}-azpl-init"
4747
maybe_build iv "${latest_pt}" "${latest_azpl}"

docs/source/versioning.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The following table shows the compatibility between Fine-Tuning Scheduler, PyTor
5959
* - 2.10.x
6060
- 2.6.0
6161
- 2.10.0
62-
- >= 2.5.0
62+
- >= 2.6.0
6363
* - 2.9.x
6464
- 2.5.0
6565
- 2.9.0

requirements/ci/overrides.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# uv pip install -e ".[all]" --override requirements/ci/overrides.txt --torch-backend=auto
1111

1212
# Lightning commit pin - update this when testing against new Lightning commits
13-
lightning @ git+https://github.com/Lightning-AI/lightning.git@affee2885b1913ca12e4c5dd5c0da82038918c40
13+
lightning @ git+https://github.com/Lightning-AI/lightning.git@854037098554a5fbf6ab7c66ae9617987e82911f

requirements/ci/requirements-oldest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile pyproject.toml --extra all --group dev --group test --output-file /home/speediedan/repos/finetuning-scheduler/requirements/ci/requirements-oldest.txt --no-strip-extras --resolution lowest-direct --universal --python-version 3.10
2+
# uv pip compile pyproject.toml --extra all --group dev --group test --output-file /home/speediedan/repos/fts-release/requirements/ci/requirements-oldest.txt --no-strip-extras --resolution lowest-direct --universal --python-version 3.10
33
aiohappyeyeballs==2.6.1
44
# via aiohttp
55
aiohttp==3.13.3

requirements/ci/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile pyproject.toml --extra all --group dev --group test --output-file /home/speediedan/repos/finetuning-scheduler/requirements/ci/requirements.txt --no-strip-extras --resolution highest --universal --python-version 3.10
2+
# uv pip compile pyproject.toml --extra all --group dev --group test --output-file /home/speediedan/repos/fts-release/requirements/ci/requirements.txt --no-strip-extras --resolution highest --universal --python-version 3.10
33
aiohappyeyeballs==2.6.1
44
# via aiohttp
55
aiohttp==3.13.3

scripts/build_fts_env.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ unset target_env_name
2121
unset uv_install_flags
2222
unset no_commit_pin
2323
unset venv_dir
24+
unset torch_backend
2425
unset oldest
2526
declare -a from_source_specs=()
2627

@@ -37,6 +38,7 @@ Usage: $0
3738
[ --uv_install_flags "flags" ]
3839
[ --no_commit_pin ]
3940
[ --venv-dir input ]
41+
[ --torch-backend input ] (cpu, cu128, auto; default: cu128 for CUDA 12.8)
4042
[ --from-source "package:path[:extras][:ENV_VAR=value]" ]
4143
[ --help ]
4244
Examples:
@@ -63,7 +65,7 @@ EOF
6365
exit 1
6466
}
6567

66-
args=$(getopt -o '' --long repo_home:,target_env_name:,oldest,uv_install_flags:,no_commit_pin,venv-dir:,from-source:,help -- "$@")
68+
args=$(getopt -o '' --long repo_home:,target_env_name:,oldest,uv_install_flags:,no_commit_pin,venv-dir:,torch-backend:,from-source:,help -- "$@")
6769
if [[ $? -gt 0 ]]; then
6870
usage
6971
fi
@@ -78,6 +80,7 @@ do
7880
--uv_install_flags) uv_install_flags=$2 ; shift 2 ;;
7981
--no_commit_pin) no_commit_pin=1 ; shift ;;
8082
--venv-dir) venv_dir=$2 ; shift 2 ;;
83+
--torch-backend) torch_backend=$2 ; shift 2 ;;
8184
--from-source)
8285
# Accumulate multiple --from-source flags into array, join with semicolon
8386
from_source_specs+=("$2")
@@ -98,6 +101,9 @@ uv_install_flags=${uv_install_flags:-""}
98101
venv_path=$(determine_venv_path "${venv_dir}" "${target_env_name}")
99102
echo "Target venv path: ${venv_path}"
100103

104+
# Set default torch backend if not specified (auto = auto-detect CUDA/CPU)
105+
torch_backend=${torch_backend:-"cu128"}
106+
101107
# Join from-source specs with semicolons
102108
from_source_spec=""
103109
if [[ ${#from_source_specs[@]} -gt 0 ]]; then
@@ -189,9 +195,9 @@ fts_install(){
189195
# requirements.txt already has torch filtered during lock generation
190196
echo "Using requirements without torch (pre-installed ${TORCH_PRE_CHANNEL})"
191197
else
192-
# Use auto torch backend for GPU detection
193-
torch_backend_flag="--torch-backend=auto"
194-
echo "Using torch backend: auto (GPU auto-detection)"
198+
# Install stable torch - use --torch-backend for automatic backend selection
199+
echo "Installing stable torch with --torch-backend=${torch_backend}..."
200+
uv pip install ${uv_install_flags} torch --torch-backend=${torch_backend}
195201
fi
196202

197203
uv pip install ${uv_install_flags} -e . -r "${req_file}" ${torch_backend_flag}

scripts/gen_fts_coverage.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ unset oldest
1515
unset no_special
1616
unset run_all_and_examples
1717
unset allow_failures
18+
unset torch_backend
1819
declare -a from_source_specs=()
1920

2021
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -26,6 +27,7 @@ Usage: $0
2627
[ --repo-home input]
2728
[ --target-env-name input ]
2829
[ --oldest ] # Use oldest CI requirements (Python 3.10, requirements-oldest.txt)
30+
[ --torch-backend input ] (cpu, auto, cu128, etc. default: auto)
2931
[ --no-rebuild-base ]
3032
[ --no-special ] # Skip special tests (standalone/experimental), run only main test suite
3133
[ --run-all-and-examples ] # Run all FTS example tests (both standalone and non-standalone)
@@ -56,7 +58,7 @@ EOF
5658
exit 1
5759
}
5860

59-
args=$(getopt -o '' --long repo-home:,repo_home:,target-env-name:,target_env_name:,oldest,no-rebuild-base,no_rebuild_base,no-special,run-all-and-examples,allow-failures,include-experimental:,include_experimental,uv-install-flags:,uv_install_flags:,no-commit-pin,no_commit_pin,venv-dir:,from-source:,dry-run,help -- "$@")
61+
args=$(getopt -o '' --long repo-home:,repo_home:,target-env-name:,target_env_name:,oldest,torch-backend:,no-rebuild-base,no_rebuild_base,no-special,run-all-and-examples,allow-failures,include-experimental:,include_experimental,uv-install-flags:,uv_install_flags:,no-commit-pin,no_commit_pin,venv-dir:,from-source:,dry-run,help -- "$@")
6062
if [[ $? -gt 0 ]]; then
6163
usage
6264
fi
@@ -68,6 +70,7 @@ do
6870
--repo-home|--repo_home) repo_home=$2 ; shift 2 ;;
6971
--target-env-name|--target_env_name) target_env_name=$2 ; shift 2 ;;
7072
--oldest) oldest=1 ; shift ;;
73+
--torch-backend) torch_backend=$2 ; shift 2 ;;
7174
--no-rebuild-base|--no_rebuild_base) no_rebuild_base=1 ; shift ;;
7275
--no-special) no_special=1 ; shift ;;
7376
--run-all-and-examples) run_all_and_examples=1 ; shift ;;
@@ -145,6 +148,11 @@ env_rebuild(){
145148
cmd_args+=("--venv-dir=${venv_dir}")
146149
fi
147150

151+
# Add torch-backend flag if specified
152+
if [[ -n "${torch_backend}" ]]; then
153+
cmd_args+=("--torch-backend=${torch_backend}")
154+
fi
155+
148156
# Add from-source parameters
149157
for spec in "${from_source_specs[@]}"; do
150158
cmd_args+=("--from-source=${spec}")

src/finetuning_scheduler/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import time
22

33
_this_year = time.strftime("%Y")
4-
__version__ = "2.10.0.dev0"
4+
__version__ = "2.10.0"
55
__author__ = "Dan Dale"
66
__author_email__ = "[email protected]"
77
__license__ = "Apache-2.0"

0 commit comments

Comments
 (0)