Skip to content

PyTorch: fix master and mkldnn builds#16560

Merged
adamjstewart merged 1 commit intospack:developfrom
adamjstewart:packages/py-torch
May 11, 2020
Merged

PyTorch: fix master and mkldnn builds#16560
adamjstewart merged 1 commit intospack:developfrom
adamjstewart:packages/py-torch

Conversation

@adamjstewart
Copy link
Copy Markdown
Member

@adamjstewart adamjstewart commented May 10, 2020 •
edited
Loading

We can't set PYTORCH_BUILD_VERSION to master, otherwise the build crashes with:

     2051    In file included from ../caffe2/core/common.h:27:0,
     2052                     from ../caffe2/perfkernels/common_avx2.cc:5:
  >> 2053    ./caffe2/core/macros.h:12:30: error: 'master' was not declared in this scope
     2054     #define CAFFE2_VERSION_MINOR master
     2055                                  ^
     2056    ./caffe2/core/macros.h:16:5: note: in expansion of macro 'CAFFE2_VERSION_MINOR'
     2057         CAFFE2_VERSION_MINOR < 100,
     2058         ^
  >> 2059    ./caffe2/core/macros.h:13:30: error: 'master' was not declared in this scope
     2060     #define CAFFE2_VERSION_PATCH master
     2061                                  ^
     2062    ./caffe2/core/macros.h:19:5: note: in expansion of macro 'CAFFE2_VERSION_PATCH'
     2063         CAFFE2_VERSION_PATCH < 100,
     2064         ^
     2065    [1035/2226] Building CXX object caffe2/perfkernels/CMakeFiles/Caffe2_perfkernels_avx2.dir/fused_8bit_rowwise_conversion_avx2.cc.o

Also, the intel-mkl-dnn package was renamed to dnnl, and then renamed again to onednn. Update py-torch to use the right dependency name.

@tgamblin why didn't your package sanity dependency checks catch the missing intel-mkl-dnn package?

EDIT: Oh, that test only looks at depends_on, the spec of non-existing package bug can only be caught at run-time.

@adamjstewart adamjstewart merged commit c03d468 into spack:develop May 11, 2020
@adamjstewart adamjstewart deleted the packages/py-torch branch May 11, 2020 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

update-package

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@adamjstewart