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.

Sign up for GitHub

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

Jump to bottom

[CI] Fix Google Mock differences between Ubuntu 18.04 and 16.04 #9141

Merged
merged 1 commit into from
Sep 29, 2021
Merged

[CI] Fix Google Mock differences between Ubuntu 18.04 and 16.04 #9141

merged 1 commit into from
Sep 29, 2021

Conversation

Mousius
Copy link
Member

@Mousius Mousius commented Sep 28, 2021

I thought I got all of these, but turns out I didn't, there's another weirdism in how Google Mock and Google Test are packaged on Ubuntu where the cmake command fails due to directories outside of the build root.

Double checked logs on Ubuntu 18.04 and Ubuntu 16.04 for this after enabling verbose copying:

$ ./docker/build.sh ci_cpu --net=host
...
'googlemock/libgmock.a' -> '/usr/lib/libgmock.a'
'googlemock/libgmock_main.a' -> '/usr/lib/libgmock_main.a'
'googlemock/gtest/libgtest.a' -> '/usr/lib/libgtest.a'
'googlemock/gtest/libgtest_main.a' -> '/usr/lib/libgtest_main.a'

$ ./docker/build.sh ci_i386 --net=host
...
'libgtest.a' -> '/usr/lib/libgtest.a'
'libgtest_main.a' -> '/usr/lib/libgtest_main.a'
...
'libgmock.a' -> '/usr/lib/libgmock.a'
'libgmock_main.a' -> '/usr/lib/libgmock_main.a'

@Mousius
Fix Google Mock differences between Ubuntu 18.04 and 16.04
9b9f3b1 
I thought I got all of these, but turns out I didn't, there's another weirdism in how Google Mock and Google Test are packaged on Ubuntu where the `cmake` command fails due to directories outside of the build root.

Double checked logs on Ubuntu 18.04 and Ubuntu 16.04 for this after enabling verbose copying:
```shell
$ ./docker/build.sh ci_cpu --net=host
...
'googlemock/libgmock.a' -> '/usr/lib/libgmock.a'
'googlemock/libgmock_main.a' -> '/usr/lib/libgmock_main.a'
'googlemock/gtest/libgtest.a' -> '/usr/lib/libgtest.a'
'googlemock/gtest/libgtest_main.a' -> '/usr/lib/libgtest_main.a'

$ ./docker/build.sh ci_i386 --net=host
...
'libgtest.a' -> '/usr/lib/libgtest.a'
'libgtest_main.a' -> '/usr/lib/libgtest_main.a'
...
'libgmock.a' -> '/usr/lib/libgmock.a'
'libgmock_main.a' -> '/usr/lib/libgmock_main.a'
```
@Mousius
Copy link
Member Author

Mousius commented Sep 28, 2021

@leandron @areusch apologies for missing this!

leandron
leandron approved these changes Sep 29, 2021
View reviewed changes
Copy link
Contributor

@leandron leandron left a comment

Choose a reason for hiding this comment

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

LGTM

@leandron leandron merged commit 0d27ba0 into apache:main Sep 29, 2021
@Mousius Mousius deleted the google-mock-fix branch September 29, 2021 10:07
AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request Sep 29, 2021
@AndrewZhaoLuo
Merge branch 'main' into aluo/onnx/support-nllloss-tests
6f5aeb1 
* main:
  Fix flaky NMS test by making sure scores are unique (apache#9140)
  [Relay] Merge analysis/context_analysis.cc and transforms/device_annotation.cc (apache#9038)
  [LLVM] Make changes needed for opaque pointers (apache#9138)
  Arm(R) Ethos(TM)-U NPU codegen integration (apache#8849)
  [CI] Split Integration tests out of first phase of pipeline (apache#9128)
  [Meta Schedule][M3b] Runner (apache#9111)
  Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
  [TIR] add loop partition hint pragma (apache#9121)
  fix things (apache#9146)
  [Meta Schedule][M3a] SearchStrategy (apache#9132)
  [Frontend][PyTorch] support for quantized conv_transpose2d op (apache#9133)
  [UnitTest] Parametrized test_conv2d_int8_intrinsics (apache#9143)
  [OpenCL] Remove redundant visit statement in CodeGen. (apache#9144)
  [BYOC] support arbitrary input dims for add/mul/relu of dnnl c_src codegen (apache#9127)
  [Relay][ConvertLayout] Support for qnn.conv2d_transpose (apache#9139)
  add nn.global_avgpool to fq2i (apache#9137)
  [UnitTests] Enable minimum testing on Vulkan target in CI (apache#9093)
  [Torch] Support returning quantized weights and bias for BYOC use cases (apache#9135)
  [Relay] Prepare for new plan_devices.cc (part II) (apache#9130)
  [microTVM][Zephyr] Add MIMXRT1050 board support (apache#9068)
@Mousius Mousius mentioned this pull request Sep 30, 2021
Closed
7 tasks
AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request Sep 30, 2021
@AndrewZhaoLuo
Merge branch 'main' into aluo/support-negative-indices
c9b4589 
* main: (80 commits)
  Introduce centralised name transformation functions (apache#9088)
  [OpenCL] Add vectorization to cuda conv2d_nhwc schedule (apache#8636)
  [6/6] Arm(R) Ethos(TM)-U NPU codegen integration with `tvmc` (apache#8854)
  [microTVM] Add wrapper for creating project using a MLF (apache#9090)
  Fix typo (apache#9156)
  [Hotfix][Testing] Wait for RPCServer to be established (apache#9150)
  Update find cublas so it search default path if needed. (apache#9149)
  [TIR][LowerMatchBuffer] Fix lowering strides when source region has higher dimension than the buffer (apache#9145)
  Fix flaky NMS test by making sure scores are unique (apache#9140)
  [Relay] Merge analysis/context_analysis.cc and transforms/device_annotation.cc (apache#9038)
  [LLVM] Make changes needed for opaque pointers (apache#9138)
  Arm(R) Ethos(TM)-U NPU codegen integration (apache#8849)
  [CI] Split Integration tests out of first phase of pipeline (apache#9128)
  [Meta Schedule][M3b] Runner (apache#9111)
  Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
  [TIR] add loop partition hint pragma (apache#9121)
  fix things (apache#9146)
  [Meta Schedule][M3a] SearchStrategy (apache#9132)
  [Frontend][PyTorch] support for quantized conv_transpose2d op (apache#9133)
  [UnitTest] Parametrized test_conv2d_int8_intrinsics (apache#9143)
  ...
@areusch
Copy link
Contributor

areusch commented Oct 3, 2021

thanks for following up!

@Mousius Mousius mentioned this pull request Oct 6, 2021
Merged
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 7, 2022
@Mousius @ylc
Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
c7af20a 
I thought I got all of these, but turns out I didn't, there's another weirdism in how Google Mock and Google Test are packaged on Ubuntu where the `cmake` command fails due to directories outside of the build root.

Double checked logs on Ubuntu 18.04 and Ubuntu 16.04 for this after enabling verbose copying:
```shell
$ ./docker/build.sh ci_cpu --net=host
...
'googlemock/libgmock.a' -> '/usr/lib/libgmock.a'
'googlemock/libgmock_main.a' -> '/usr/lib/libgmock_main.a'
'googlemock/gtest/libgtest.a' -> '/usr/lib/libgtest.a'
'googlemock/gtest/libgtest_main.a' -> '/usr/lib/libgtest_main.a'

$ ./docker/build.sh ci_i386 --net=host
...
'libgtest.a' -> '/usr/lib/libgtest.a'
'libgtest_main.a' -> '/usr/lib/libgtest_main.a'
...
'libgmock.a' -> '/usr/lib/libgmock.a'
'libgmock_main.a' -> '/usr/lib/libgmock_main.a'
```
ylc pushed a commit to ylc/tvm that referenced this pull request Jan 13, 2022
@Mousius @ylc
Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
4d78d68 
I thought I got all of these, but turns out I didn't, there's another weirdism in how Google Mock and Google Test are packaged on Ubuntu where the `cmake` command fails due to directories outside of the build root.

Double checked logs on Ubuntu 18.04 and Ubuntu 16.04 for this after enabling verbose copying:
```shell
$ ./docker/build.sh ci_cpu --net=host
...
'googlemock/libgmock.a' -> '/usr/lib/libgmock.a'
'googlemock/libgmock_main.a' -> '/usr/lib/libgmock_main.a'
'googlemock/gtest/libgtest.a' -> '/usr/lib/libgtest.a'
'googlemock/gtest/libgtest_main.a' -> '/usr/lib/libgtest_main.a'

$ ./docker/build.sh ci_i386 --net=host
...
'libgtest.a' -> '/usr/lib/libgtest.a'
'libgtest_main.a' -> '/usr/lib/libgtest_main.a'
...
'libgmock.a' -> '/usr/lib/libgmock.a'
'libgmock_main.a' -> '/usr/lib/libgmock_main.a'
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leandron leandron leandron approved these changes

@areusch areusch Awaiting requested review from areusch

@jroesch jroesch Awaiting requested review from jroesch

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mousius @areusch @leandron