Skip to content

Comments

openimagedenoise: fix cmake tbb discovery#216853

Closed
davidak wants to merge 1 commit intoNixOS:masterfrom
davidak:openimagedenoise-fix
Closed

openimagedenoise: fix cmake tbb discovery#216853
davidak wants to merge 1 commit intoNixOS:masterfrom
davidak:openimagedenoise-fix

Conversation

@davidak
Copy link
Member

@davidak davidak commented Feb 17, 2023 •
edited
Loading

Description of changes

Fixes #216580

Alternative: #216842, #216844

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@davidak davidak force-pushed the openimagedenoise-fix branch from 2a12d27 to 9f16342 Compare February 17, 2023 19:35
@davidak davidak changed the title openimagedenoise: fix tbb discovery openimagedenoise: fix cmake tbb discovery Feb 17, 2023
@davidak
Copy link
Member Author

davidak commented Feb 17, 2023

Result of nixpkgs-review pr 216853 run on x86_64-linux 1

5 packages failed to build:
  • blender
  • blender-hip
  • openimagedenoise
  • openimagedenoise_1_2_x
  • python310Packages.bpycv

@davidak
Copy link
Member Author

davidak commented Feb 17, 2023

@MultisampledNight what am i doing wrong?

@MultisampledNight
Copy link
Contributor

MultisampledNight commented Feb 17, 2023

I'm not sure, tbh. Are you running the 22.11 or the unstable channel?

@davidak
Copy link
Member Author

davidak commented Feb 17, 2023 •
edited
Loading

My system runs NixOS 22.11.2568.c43f676c938 with Nix 2.11.1.

It's the same change you did, right?

Can you try nixpkgs-review pr 216853 on your system?

@davidak
Copy link
Member Author

davidak commented Feb 17, 2023 •
edited
Loading

For some reason i used TBB_ROOT_DIR instead of TBB_ROOT.

https://github.com/OpenImageDenoise/oidn/blob/11872d99de4f57786e16ae687945e2b0bc74cb1e/cmake/FindTBB.cmake#L23

@davidak davidak force-pushed the openimagedenoise-fix branch from 9f16342 to 7f54409 Compare February 17, 2023 20:14
@davidak
Copy link
Member Author

davidak commented Feb 17, 2023 •
edited
Loading

Result of nixpkgs-review pr 216853 run on x86_64-linux 1

4 packages failed to build:
  • blender
  • blender-hip
  • openimagedenoise_1_2_x
  • python310Packages.bpycv
1 package built:
  • openimagedenoise

openimagedenoise_1_2_x issue unrelated. was already broken before the tbb split (#212787) at c69ebeb

[ 94%] Built target OpenImageDenoise
[ 96%] Building CXX object apps/CMakeFiles/oidnTest.dir/oidnTest.cpp.o
[ 96%] Building CXX object apps/CMakeFiles/oidnBenchmark.dir/oidnBenchmark.cpp.o
[ 97%] Building CXX object apps/CMakeFiles/oidnDenoise.dir/oidnDenoise.cpp.o
In file included from /nix/store/4grm35slwd5il8v9sfkibl164ays38hp-glibc-2.35-224-dev/include/signal.h:328,
                 from /build/source/apps/catch.hpp:7978,
                 from /build/source/apps/oidnTest.cpp:12:
/build/source/apps/catch.hpp:10763:58: error: call to non-'constexpr' function 'long int sysconf(int)'
10763 |     static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
      |                                                          ^~~~~~~~~~~
In file included from /nix/store/4grm35slwd5il8v9sfkibl164ays38hp-glibc-2.35-224-dev/include/bits/sigstksz.h:24:
/nix/store/4grm35slwd5il8v9sfkibl164ays38hp-glibc-2.35-224-dev/include/unistd.h:640:17: note: 'long int sysconf(int)' declared here
  640 | extern long int sysconf (int __name) __THROW;
      |                 ^~~~~~~
/build/source/apps/catch.hpp:10822:45: error: size of array 'altStackMem' is not an integral constant-expression
10822 |     char FatalConditionHandler::altStackMem[sigStackSize] = {};
      |                                             ^~~~~~~~~~~~
[ 98%] Linking CXX executable ../oidnDenoise
[ 98%] Built target oidnDenoise
make[2]: *** [apps/CMakeFiles/oidnTest.dir/build.make:76: apps/CMakeFiles/oidnTest.dir/oidnTest.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:278: apps/CMakeFiles/oidnTest.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 99%] Linking CXX executable ../oidnBenchmark
[ 99%] Built target oidnBenchmark
make: *** [Makefile:156: all] Error 2

@davidak davidak mentioned this pull request Feb 17, 2023
Merged
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 17, 2023
@davidak
Copy link
Member Author

davidak commented Feb 17, 2023

Closing in favor of #216844.

@davidak davidak closed this Feb 17, 2023
@davidak davidak deleted the openimagedenoise-fix branch February 17, 2023 21:23
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

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Build failure: openimagedenoise

2 participants

@davidak @MultisampledNight