Skip to content

Commit ceec06c

Browse files
author
Adrià Garriga-Alonso
authored
Merge pull request #2 from AlignmentResearch/chore/pull-in-upstream
Chore/pull in upstream
2 parents 081756b + e91326b commit ceec06c

File tree

108 files changed

+1346
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1346
-717
lines changed

.github/workflows/nightly-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: setup python
4141
uses: actions/setup-python@v2
4242
with:
43-
python-version: '3.7'
43+
python-version: '3.8'
4444
architecture: x64
4545

4646
- name: install deps

.github/workflows/pull-request.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ on:
2424
- reopened
2525
- edited
2626
jobs:
27-
validate-naming-convention:
28-
name: Pull Request's title matches naming convention
29-
runs-on: ubuntu-latest
30-
steps:
31-
- uses: deepakputhraya/action-pr-title@master
32-
with:
33-
regex: '^\[(?:feat|fix|doc|refactor|deprecation)\]\s[A-Z].*(?<!\.)$'
34-
github_token: ${{ github.token }}
27+
# validate-naming-convention:
28+
# name: Pull Request's title matches naming convention
29+
# runs-on: ubuntu-latest
30+
# steps:
31+
# - uses: deepakputhraya/action-pr-title@master
32+
# with:
33+
# regex: '^\[(?:feat|fix|doc|refactor|deprecation)\]\s[A-Z].*(?<!\.)$'
34+
# github_token: ${{ github.token }}
3535
run-checks:
3636
if: github.event.pull_request.draft == false && github.event.action != 'edited'
3737
runs-on: ubuntu-latest
@@ -68,8 +68,8 @@ jobs:
6868
6969
storage-performance-checks:
7070
needs: run-checks
71-
concurrency: perf-tests
72-
runs-on: [self-hosted, performance-tests]
71+
concurrency: storage-performance-checks
72+
runs-on: [self-hosted, perf-tests]
7373
name: Performance tests
7474
steps:
7575
- name: checkout

.github/workflows/python-package.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
python -m pip install -r requirements.txt
9797
9898
- name: Build bdist wheels for 'cp37-cp37m'
99+
if: matrix.manylinux-version == 'manylinux_2_24_x86_64'
99100
uses: nick-fields/retry@v2
100101
with:
101102
max_attempts: 3

CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Changelog
22

3+
## Unreleased:
4+
5+
### Fixes:
6+
- Fix issues with tag false reassignment (mihran113)
7+
8+
## 3.29.1 May 8, 2025:
9+
10+
### Enhancements:
11+
- Constant indexing of in-progress runs (alberttorosyan)
12+
- Fallback to union view if index db is missing (alberttorosyan, mihran113)
13+
14+
15+
### Fixes:
16+
- Fix min/max calculation for single point metrics (mihran113)
17+
- Aim web ui integration in jupyter/colab (larissapoghosyan)
18+
- Package publishing for Linux/Python 3.7 (alberttorosyan)
19+
20+
## 3.29.0 May 8, 2025 (Yanked)
21+
22+
## 3.28.0 Mar 21, 2025
23+
24+
### Enhancements:
25+
- Skip metrics check when run is known to yield false result (alberttorosyan)
26+
- Remove metric version check to improve performance of metric retrieval (mihran113)
27+
- Move indexing thread to main process of `aim up` (alberttorosyan)
28+
- Add AimCallback implementation for hugging face distributed runs (VassilisVassiliadis)
29+
- Add py.typed marker to allow usage of existing type annotations (bluenote10)
30+
31+
32+
### Fixes:
33+
- Decrease client resources keep-alive time (mihran113)
34+
- Fix connection of data points on epoch alignment (mihran113)
35+
- Resolve issue with adding duplicate tags to the same run (mihran113)
36+
- Improve error messages for remote tracking server (mihran113)
37+
- Fix spurious assertion error in message stream parsing (qzed)
38+
- Correct indentation on query proxy object return statement (alberttorosyan)
39+
- Fix typing issues in S3ArtifactStorage implementation (sbatchelder)
40+
41+
342
## 3.27.0 Dec 18, 2024
443

544
### Enhancements:

aim/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.27.0
1+
3.29.1

aim/acme.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Alias to SDK acme interface
2-
from aim.sdk.adapters.acme import AimCallback, AimWriter # noqa F401
2+
from aim.sdk.adapters.acme import AimCallback as AimCallback
3+
from aim.sdk.adapters.acme import AimWriter as AimWriter

aim/cli/convert/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def convert_tensorboard(ctx, logdir, flat, no_cache):
4040
@click.option('--flat', '-f', required=False, is_flag=True, default=False)
4141
def convert_tensorflow(ctx, logdir, flat):
4242
click.secho(
43-
"WARN: Command 'tf' is deprecated and will be removed in future releases," " please use 'tensorboard' instead.",
43+
"WARN: Command 'tf' is deprecated and will be removed in future releases, please use 'tensorboard' instead.",
4444
fg='red',
4545
)
4646
repo_inst = ctx.obj['repo_inst']

aim/cli/init/commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ def init(repo, yes, skip_if_exists):
2020
re_init = False
2121
if Repo.exists(repo_path):
2222
if yes and skip_if_exists:
23-
raise click.BadParameter('Conflicting init options.' 'Either specify -y/--yes or -s/--skip-if-exists')
23+
raise click.BadParameter('Conflicting init options.Either specify -y/--yes or -s/--skip-if-exists')
2424
elif yes:
2525
re_init = True
2626
elif skip_if_exists:
2727
click.echo('Repo exists at {}. Skipped initialization.'.format(repo_path))
2828
return
2929
else:
3030
re_init = click.confirm(
31-
'Aim repository is already initialized. ' 'Do you want to re-initialize to empty Aim repository?'
31+
'Aim repository is already initialized. Do you want to re-initialize to empty Aim repository?'
3232
)
3333
if not re_init:
3434
return

aim/cli/manager/manager.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ def check_startup_success():
3333
import requests
3434

3535
server_path = 'http://{}:{}{}'.format(args['--host'], args['--port'], args['--base-path'])
36-
status_api = f'{server_path}/api/projects/status'
37-
retry_count = 5
38-
sleep_interval = 1
36+
status_api = f'{server_path}/api/projects/'
37+
retry_count = 10
38+
sleep_interval = 0.1
3939
for _ in range(retry_count):
40+
time.sleep(sleep_interval)
41+
sleep_interval *= 2
4042
try:
4143
response = requests.get(status_api)
4244
if response.status_code == 200:
4345
return True
4446
except Exception:
4547
pass
46-
sleep_interval += 1
47-
time.sleep(sleep_interval)
4848

4949
return False
5050

aim/cli/runs/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def update_metrics(ctx, yes):
195195
index_manager = RepoIndexManager.get_index_manager(repo)
196196
hashes = repo.list_all_runs()
197197
for run_hash in tqdm.tqdm(hashes, desc='Updating runs', total=len(hashes)):
198-
meta_tree = repo.request_tree('meta', run_hash, read_only=False, from_union=False)
198+
meta_tree = repo.request_tree('meta', run_hash, read_only=False)
199199
meta_run_tree = meta_tree.subtree(('meta', 'chunks', run_hash))
200200
try:
201201
# check if the Run has already been updated.

0 commit comments

Comments
 (0)