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

[netcdf-c/nvtt] Update to the latest version #13674

Merged
merged 11 commits into from
Oct 24, 2020

Conversation

NancyLi1013
Copy link
Contributor

Update to the latest version

Related #13536

Note: No feature needs to test.

@NancyLi1013 NancyLi1013 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Sep 23, 2020

ADD_LIBRARY(nvsquish STATIC ${SQUISH_SRCS})
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this library also need to be installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it seems to be needed by OSG. Please see here #6611 (comment).

@NancyLi1013
Copy link
Contributor Author

nvtt: x86-windows failed like this:

nvcc fatal   : 32 bit compilation is only supported for Microsoft Visual Studio 2013 and earlier
CMake Error at cuda_compile_1_generated_CompressKernel.cu.obj.Debug.cmake:220 (message):
  Error generating
  D:/buildtrees/nvtt/x86-windows-dbg/src/nvtt/CMakeFiles/cuda_compile_1.dir/cuda/./cuda_compile_1_generated_CompressKernel.cu.obj

So I will add Supports: !x86 to skip the check on CI.

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

LGTM

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Sep 29, 2020
@dan-shaw
Copy link
Contributor

dan-shaw commented Oct 6, 2020

/azp run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@NancyLi1013
Copy link
Contributor Author

nvtt failed on osx is due to this error:

In file included from /Users/vagrant/Data/buildtrees/nvtt/src/2188752e3f-1c6503c2c5.clean/src/nvtt/icbc.cpp:3:
/Users/vagrant/Data/buildtrees/nvtt/src/2188752e3f-1c6503c2c5.clean/src/nvtt/icbc.h:2797:12: error: always_inline function '_pdep_u32' requires target feature 'bmi2', but would be inlined into function 'interleave' that is compiled without support for 'bmi2'
    return _pdep_u32(a, 0x55555555) | _pdep_u32(b, 0xaaaaaaaa);
           ^
/Users/vagrant/Data/buildtrees/nvtt/src/2188752e3f-1c6503c2c5.clean/src/nvtt/icbc.h:2797:39: error: always_inline function '_pdep_u32' requires target feature 'bmi2', but would be inlined into function 'interleave' that is compiled without support for 'bmi2'
    return _pdep_u32(a, 0x55555555) | _pdep_u32(b, 0xaaaaaaaa);
                                      ^
/Users/vagrant/Data/buildtrees/nvtt/src/2188752e3f-1c6503c2c5.clean/src/nvtt/icbc.h:656:12: error: always_inline function '_mm256_fmadd_ps' requires target feature 'fma', but would be inlined into function 'vmadd' that is compiled without support for 'fma'
    return _mm256_fmadd_ps(a, b, c);
           ^
/Users/vagrant/Data/buildtrees/nvtt/src/2188752e3f-1c6503c2c5.clean/src/nvtt/icbc.h:666:12: error: always_inline function '_mm256_fmsub_ps' requires target feature 'fma', but would be inlined into function 'vmsub' that is compiled without support for 'fma'
    return _mm256_fmsub_ps(a, b, c);
           ^
4 errors generated.

But I cannot reproduce this on my local machine.

@PhoebeHui PhoebeHui removed the info:reviewed Pull Request changes follow basic guidelines label Oct 12, 2020
@JackBoosY
Copy link
Contributor

@strega-nil Could you please take a look at osx failure?

Thanks.

@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor Author

@strega-nil
I try to rebuild this on our local osx machine. But I still cannot reproduce it now.
I also checked the config and build log and I didn't found any exception about this.

The osx machine used the same compiler as that in CI.

-- The C compiler identification is AppleClang 12.0.0.12000032
-- The CXX compiler identification is AppleClang 12.0.0.12000032

I have no idea about this issue now.

Could you please help take a look and give some suggestions?

Thanks.

@strega-nil
Copy link
Contributor

@NancyLi1013 weird; I was able to repro it in the VM, though, so there's clearly an issue.

Use the VM that's on vcpkgmm-03; you can get into it by accessing:

vcpkgmm-03$ cd ~/vagrant/vcpkg-eg-mac
vcpkgmm-03$ vagrant ssh

and then you'll find the vcpkg root with this SHA checked out at ~/vcpkg in the VM.
Make sure to remember to set up your environment variables inside the VM:

$ export VCPKG_DEFAULT_BINARY_CACHE=/Users/vagrant/Data/archives
$ export VCPKG_DOWNLOADS=/Users/vagrant/Data/downloads
$ export WORKING_ROOT=/Users/vagrant/Data

@NancyLi1013
Copy link
Contributor Author

Thanks for your help and suggestions @strega-nil . I will try to reproduce this first according to your above guidelines.

@NancyLi1013
Copy link
Contributor Author

It seems that we have no permission to access the VM machine vcpkgmm-03. I try to connect to this machine and it failed like this:

Password:
Access denied
Using keyboard-interactive authentication.
Password:

@PhoebeHui
Copy link
Contributor

Try to fix the issue on osx by adding compile option '-mbmi2 -mfma' to nvtt on osx.

See more information about the failure: https://stackoverflow.com/questions/59590790/how-to-enable-instrinsic-functions-from-the-preprocessor

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Oct 22, 2020
@NancyLi1013
Copy link
Contributor Author

Thanks for your help to fix this issue on osx @PhoebeHui.

Sorry for my mistake to use the wrong command.

@BillyONeal
Copy link
Member

@NancyLi1013 I think Robert's code review comment is that you are patching in an add_library but aren't patching in an equivalent install to install that library. Can you confirm this is doing the right thing for install? /cc @ras0219 @ras0219-msft

@BillyONeal BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Oct 23, 2020
@NancyLi1013
Copy link
Contributor Author

@BillyONeal
Thanks for your review and pointing this out.

It seems that the targets name installed should be nvsquish instead of squish , which is different between version 2.1.1 and 2.1.2.

I will update it soon.

@BillyONeal BillyONeal merged commit a97e32f into microsoft:master Oct 24, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution!

BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Oct 25, 2020
This was regressed by microsoft#13674

REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt.

Installing package nvtt[core]:x64-linux...
The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux

Installed by libsquish:x64-linux
    debug/lib/libsquishd.a
    include/squish.h
    lib/libsquish.a
BillyONeal added a commit that referenced this pull request Oct 25, 2020
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6.

In a recent CI build, we started getting output like:

Installing package libp7-baical[core]:x86-windows...
The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows

Installed by libp7client:x86-windows
    bin/P7x32.dll
    bin/P7x32.pdb
    debug/bin/P7x32d.dll
    debug/bin/P7x32d.pdb
    include/P7/GTypes.h
    include/P7/P7_Client.h
    include/P7/P7_Cproxy.h
    include/P7/P7_Extensions.h
    include/P7/P7_Telemetry.h
    include/P7/P7_Trace.h

It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version.

* [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure.

* Fix several "passing: remove from fail list."

* [akali] Disable parallel configure.

REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt.

Attempts to fix:

CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp
CMake Error: : System Error: Permission denied
CMake Error at CMakeLists.txt:20 (configure_file):
  configure_file Problem configuring file

* [nvtt] Devendor libsquish

This was regressed by #13674

REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt.

Installing package nvtt[core]:x64-linux...
The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux

Installed by libsquish:x64-linux
    debug/lib/libsquishd.a
    include/squish.h
    lib/libsquish.a

* [knet] Disable parallel configure.

REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt.

CMake Error at src/CMakeLists.txt:1 (configure_file):
  configure_file Problem configuring file

* [libnice] Diable parallel configure.

REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt.

CMake Error at CMakeLists.txt:13 (configure_file):
  configure_file Problem configuring file
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:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants