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

[Vc] Update to 1.4.3 #24880

Merged
merged 1 commit into from
May 31, 2022
Merged

[Vc] Update to 1.4.3 #24880

merged 1 commit into from
May 31, 2022

Conversation

bernhardmgruber
Copy link
Contributor

@bernhardmgruber bernhardmgruber commented May 23, 2022

This PR updates the version of Vc, the C++ SIMD library, to its newest release 1.4.3. It also replaces some of the deprecated cmake calls in the portfile, removes a patch that has been fixed upstream and adds the license attribute in vcpkg.json.

  • Does your PR follow the maintainer guide?

    I hope so

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes, I amended the commit with the result.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/vc/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/vc/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/vc/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/vc/vcpkg.json

Valid values for the license field can be found in the documentation

@bernhardmgruber bernhardmgruber marked this pull request as ready for review May 23, 2022 13:09
@FrankXie05 FrankXie05 self-assigned this May 24, 2022
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label May 24, 2022
"description": "SIMD Vector Classes for C++ .",
"homepage": "https://github.com/VcDevel/Vc",
"supports": "!arm64"
"license": "BSD-3-Clause",
"supports": "!arm64 & !uwp",
Copy link
Contributor

Choose a reason for hiding this comment

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

One last question, I tested it locally. Version 1.4.2 supports uwp builds, why is it disabled? Does the new version not support it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had uwp builds enabled initially, but then the CI failed, so I just disabled them. I can retry.

@FrankXie05
Copy link
Contributor

FrankXie05 commented May 24, 2022

From CI failure logs for x64-uwp:

D:\buildtrees\vc\src\1.4.3-2c1396b7e3.clean\src\support_x86.cpp(62): error C2373: 'Vc_1::isImplementationSupported': redefinition; different type modifiers
D:\buildtrees\vc\src\1.4.3-2c1396b7e3.clean\Vc/support.h(75): note: see declaration of 'Vc_1::isImplementationSupported'

It looks like a problem with duplicate definitions of this variable or maybe a bug in MSVC. I don't know, should take a deep look at the code structure of port VC. Maybe we should use the original function defined in support.h(https://github.com/VcDevel/Vc/blob/53a102fe1906ca59fdd307c1100e72db16a5eef8/Vc/support.h#L75)🤔

@FrankXie05
Copy link
Contributor

FrankXie05 commented May 24, 2022

@bernhardmgruber I'm not sure if there is a better way to solve this problem?
This should submit the issue upstream, I see you have contributions in vc. Could you please confirm to upstream or submit an issue? :)

bernhardmgruber added a commit to bernhardmgruber/Vc that referenced this pull request May 30, 2022
This fixes a downstream build failure with vcpkg for triplet x64-uwp.
See PR: microsoft/vcpkg#24880
@bernhardmgruber
Copy link
Contributor Author

@FrankXie05 Thank you for finding the issue! There is indeed a declaration specifier missing upstream as you described in your issue. I created a PR to address the issue: VcDevel/Vc#347

I don't think we will release a bugfix version of Vc, since most of the userbase is using it on Linux. Including your patch for Vc 1.4.3 here in vcpkg is fine IMO, until we release Vc 1.4.4.

bernhardmgruber added a commit to VcDevel/Vc that referenced this pull request May 30, 2022
This fixes a downstream build failure with vcpkg for triplet x64-uwp.
See PR: microsoft/vcpkg#24880
@bernhardmgruber
Copy link
Contributor Author

@FrankXie05 your patch was merged upstream and will be part of Vc 1.4.4.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vc have changed but the version was not updated
version: 1.4.3#1
old SHA: 3709d5e4ff1d4bb0ec22c1d7af3c2bb4e55ab9c0
new SHA: a630bccabeeac4bbddd6ebbe24d03be964aabfb0
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@bernhardmgruber bernhardmgruber force-pushed the vc143 branch 2 times, most recently from 235ffb9 to b40177c Compare May 30, 2022 09:44
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json
index 5e95992..09bb050 100644
--- a/ports/vc/vcpkg.json
+++ b/ports/vc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vc",
   "version": "1.4.3",
-  "port-version": 0,
   "description": "SIMD Vector Classes for C++ .",
   "homepage": "https://github.com/VcDevel/Vc",
   "license": "BSD-3-Clause",
PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vc have changed but the version was not updated
version: 1.4.3
old SHA: d440f7cd3b758171944e5d14cc7c9cedf45c0ad1
new SHA: 933ac99201b15104edd8037e8bcc7959d36a6d67
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
@bernhardmgruber
Copy link
Contributor Author

I squashed all changes and removed port version 1 again.

@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label May 30, 2022
@FrankXie05
Copy link
Contributor

@bernhardmgruber It's right. Version updates need to delete the port-version field in vcpkg.json.

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!

@ras0219-msft ras0219-msft merged commit 8f77dbb into microsoft:master May 31, 2022
@bernhardmgruber bernhardmgruber deleted the vc143 branch June 1, 2022 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants