Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version take 2 #1635

Merged
merged 4 commits into from
Oct 7, 2022
Merged

version take 2 #1635

merged 4 commits into from
Oct 7, 2022

Conversation

davidslater
Copy link
Contributor

No description provided.

@mwartell
Copy link
Contributor

mwartell commented Oct 5, 2022

There are dueling changes between this and #1634. This PR covers some of the changes suggested there, but not all. They should be reconciled after this is merged.

@mwartell mwartell self-requested a review October 5, 2022 16:33
Copy link
Contributor

@mwartell mwartell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The metadata rewrite on line 106 is horrifying, but it didn't come in on this PR and will be treated in #1634

@mwartell
Copy link
Contributor

mwartell commented Oct 5, 2022

Getting an error in testing:

armory run scenario_configs/cifar10_baseline.json --check --log=debug
/home/msw/.local/lib/python3.10/site-packages/setuptools_scm/config.py:56: UserWarning: absolute root path '/home/msw/twosix/armory' overrides relative_to '/home/msw/.local/lib/python3.10/site-packages/armory/utils/version.py'
  warnings.warn(
2022-10-05 13:10:01  0s DEBUG    armory.__main__:run:375 unifying sysconfig {'docker_image': 'twosixarmory/pytorch', 'external_github_repo': None, 'gpus': 'all', 'output_dir': None, 'output_filename': None, 'use_gpu': False} and args Namespace(filepath='scenario_configs/cifar10_baseline.json', debug=False, log_level=['debug'], interactive=False, jupyter=False, port=None, use_gpu=False, no_gpu=False, gpus=None, no_docker=False, root=False, index=None, classes=None, output_dir=None, output_filename=None, check=True, num_eval_batches=None, skip_benign=False, skip_attack=False, skip_misclassified=False, validate_config=False)
2022-10-05 13:10:01  0s INFO     armory.eval.evaluator:__init__:32 Constructing Evaluator Object
2022-10-05 13:10:01  0s INFO     armory.eval.evaluator:__init__:63 Retrieving Environment Variables
2022-10-05 13:10:01  0s INFO     armory.docker.images:ensure_image_present:155 Retrieved canonical image name for twosixarmory/pytorch as twosixarmory/pytorch:0.15.4.post265.g6b18ca55
Traceback (most recent call last):
  File "/home/msw/.local/bin/armory", line 8, in <module>
    sys.exit(main())
  File "/home/msw/.local/lib/python3.10/site-packages/armory/__main__.py", line 775, in main
    func(sys.argv[2:], prog, description)
  File "/home/msw/.local/lib/python3.10/site-packages/armory/__main__.py", line 389, in run
    rig = Evaluator(config, no_docker=args.no_docker, root=args.root)
  File "/home/msw/.local/lib/python3.10/site-packages/armory/eval/evaluator.py", line 75, in __init__
    kwargs["image_name"] = images.ensure_image_present(image_name)
  File "/home/msw/.local/lib/python3.10/site-packages/armory/docker/images.py", line 157, in ensure_image_present
    prev_release = last_armory_release(canon_image_name)
  File "/home/msw/.local/lib/python3.10/site-packages/armory/docker/images.py", line 114, in last_armory_release
    raise ValueError(
ValueError: Tag 0.15.4.post265.g6b18ca55 must be in major.minor.patch[.hash] SCM version format

I don't know that this is attributable to this PR yet.

added: False alarm. That error came from a docker mismatch on my build. These are a mite too common as we make infrastructure changes prior to release.

Copy link
Contributor

@mwartell mwartell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've manually tested the version system in:

  1. nominal configuration
  2. missing .git repo
  3. shallow .git repo.

I will merge when CI completes.

@davidslater
Copy link
Contributor Author

CI tests are weird. Thoughts?

@mwartell
Copy link
Contributor

mwartell commented Oct 5, 2022

It is symptomatic of shallow clones breaking setuptools_scm. I'm hunting that down.

For example, pypa/setuptools-scm#414 but we've also seen it before.

@davidslater
Copy link
Contributor Author

I merged develop in. Hopefully checks will pass now.

@mwartell mwartell merged commit eb37f99 into twosixlabs:develop Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants