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

Cherry pick for 0.55.1 #7789

Merged
merged 15 commits into from
Jan 27, 2022
Merged

Cherry pick for 0.55.1 #7789

merged 15 commits into from
Jan 27, 2022

Conversation

esc
Copy link
Member

@esc esc commented Jan 26, 2022

🍒

CUDA: Fix linking with PTX when compiling lazily
…tation_pass

Move the type annotation pass to post legalization.
CUDA: Fixes missing type annotation pass following numba#7704
Update URLs in error messages to refer to RTD docs.
…_year

Fix the release year for Numba 0.55 change log entry.
Fix numba#7713: Ensure _prng_random_hash return has correct bitwidth
Fix numba#7751: Use original filename for array exprs
stuartarchibald and others added 2 commits January 26, 2022 15:50
…line_test

Avoid issue with DI gen for arrayexprs.
Handle Omitted/OmittedArgDataModel in DI generation.
@esc esc mentioned this pull request Jan 26, 2022
Fix issues with locating/parsing source during DebugInfo emission.
Refactor threading layer priority tests to not use stdout/stderr
CUDA: Deprecate support for CC < 5.3 and CTK < 10.2
@esc
Copy link
Member Author

esc commented Jan 27, 2022

Since the CI configuration for this branch is somewhat outdated, we opted to test this branch with the CI configuration at:

#7793

@esc
Copy link
Member Author

esc commented Jan 27, 2022

Since the CI configuration for this branch is somewhat outdated, we opted to test this branch with the CI configuration at:

#7793

#7793 was largely green, except for a NumPy 1.22 on Python 3.10 glitch -- we assume that this is also related to CI configuration and will ignore this failure.

@gmarkall
Copy link
Member

gpuci run tests

1 similar comment
@gmarkall
Copy link
Member

gpuci run tests

@gmarkall
Copy link
Member

#7793 was largely green, except for a NumPy 1.22 on Python 3.10 glitch -- we assume that this is also related to CI configuration and will ignore this failure.

Can we re-run that failed build?

@esc
Copy link
Member Author

esc commented Jan 27, 2022

#7793 was largely green, except for a NumPy 1.22 on Python 3.10 glitch -- we assume that this is also related to CI configuration and will ignore this failure.

Can we re-run that failed build?

Maybe, but I doubt it would help:

Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 568, in _build_master
    ws.require(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 886, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 777, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (numpy 1.22.1 (/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages), Requirement.parse('numpy<1.22,>=1.18'), {'numba'})

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/bin/numba", line 4, in <module>
    __import__('pkg_resources').require('numba==0.55.0+17.g0db17a144')
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3243, in <module>
    def _initialize_master_working_set():
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3226, in _call_aside
    f(*args, **kwargs)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3255, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 570, in _build_master
    return cls._build_from_requirements(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 583, in _build_from_requirements
    dists = ws.resolve(reqs, Environment())
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 772, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'numpy<1.22,>=1.18' distribution was not found and is required by numba

@esc
Copy link
Member Author

esc commented Jan 27, 2022

#7793 was largely green, except for a NumPy 1.22 on Python 3.10 glitch -- we assume that this is also related to CI configuration and will ignore this failure.

Can we re-run that failed build?

Maybe, but I doubt it would help:

Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 568, in _build_master
    ws.require(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 886, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 777, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (numpy 1.22.1 (/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages), Requirement.parse('numpy<1.22,>=1.18'), {'numba'})

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/vsts/miniconda3/envs/azure_ci/bin/numba", line 4, in <module>
    __import__('pkg_resources').require('numba==0.55.0+17.g0db17a144')
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3243, in <module>
    def _initialize_master_working_set():
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3226, in _call_aside
    f(*args, **kwargs)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 3255, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 570, in _build_master
    return cls._build_from_requirements(__requires__)
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 583, in _build_from_requirements
    dists = ws.resolve(reqs, Environment())
  File "/home/vsts/miniconda3/envs/azure_ci/lib/python3.10/site-packages/pkg_resources/__init__.py", line 772, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'numpy<1.22,>=1.18' distribution was not found and is required by numba

@gmarkall I have pinned Numpy on 3.10 explicitly now too: bbf2973

@esc
Copy link
Member Author

esc commented Jan 27, 2022

build farm was green on this numba_yaml_150.

@esc
Copy link
Member Author

esc commented Jan 27, 2022

#7793 was fully green now.

@esc esc added 3 - Ready for Review BuildFarm Passed For PRs that have been through the buildfarm and passed and removed 2 - In Progress labels Jan 27, 2022
Copy link
Member

@gmarkall gmarkall left a comment

Choose a reason for hiding this comment

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

This looks good to me - the cherry-picks match the PRs that were for 0.55.1, and I understand the buildfarm run was a full one including CUDA (gpuCI is not running right now for some reason).

@esc
Copy link
Member Author

esc commented Jan 27, 2022

now includes the change-log updates from #7796 as f8d6978

Copy link
Member

@sklam sklam left a comment

Choose a reason for hiding this comment

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

LGTM

@esc
Copy link
Member Author

esc commented Jan 27, 2022

This looks good to me - the cherry-picks match the PRs that were for 0.55.1, and I understand the buildfarm run was a full one including CUDA (gpuCI is not running right now for some reason).

Thank you @gmarkall

@esc
Copy link
Member Author

esc commented Jan 27, 2022

@gmarkall @sklam thank you for the review! I'll merge this now and get the rest of the release going!

@esc
Copy link
Member Author

esc commented Jan 27, 2022

We are ignoring public CI for this one, see comments above for notes on the verification.

@esc esc merged commit 76720bf into numba:release0.55 Jan 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 - Ready for Review BuildFarm Passed For PRs that have been through the buildfarm and passed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants