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

Jump to bottom

waifu2x-converter-cpp: 5.2.4 -> 5.3.3, add OpenCL support #100860

Merged
merged 2 commits into from Nov 27, 2020
Merged

waifu2x-converter-cpp: 5.2.4 -> 5.3.3, add OpenCL support #100860

merged 2 commits into from Nov 27, 2020

Conversation

sbruder
Copy link
Contributor

@sbruder sbruder commented Oct 17, 2020

Motivation for this change

Currently, waifu2x-converter-cpp only supports GPGPU with nvidia cards (via CUDA). This PR adds support for Intel and AMD GPUs by adding ocl-icd to the library path. This PR also updates waifu2x-converter-cpp to version 5.3.3 (which requires ocl-icd at build time), because version 5.2.4 tries to place the OpenCL device binary into the nix store at runtime (and fails since it is read only).

I tested it on an i5-4300U’s integrated GPU (via beignet) and on an AMD RX480 (via rocm).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from xzfc October 17, 2020 18:47
@SuperSandro2000 SuperSandro2000 changed the title waifu2x-converter-cpp: add OpenCL support waifu2x-converter-cpp: 5.2.4 -> 5.3.3, add OpenCL support Nov 27, 2020
@SuperSandro2000
Copy link
Member

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

1 package built:
  • waifu2x-converter-cpp

@SuperSandro2000 SuperSandro2000 merged commit 33b99ef into NixOS:master Nov 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xzfc xzfc Awaiting requested review from xzfc

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sbruder @SuperSandro2000