Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6cbf2e186cd5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6cfb2c8ebc9d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 18, 2020

  1. dnnl: 1.2.2 -> 1.4 

    The upstream readme has a note about renaming the git repo and libname:
https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn

Changelog: https://github.com/oneapi-src/oneDNN/releases/tag/v1.4
    @bhipple
    bhipple committed Apr 18, 2020
    Copy the full SHA
    dfe70a2 View commit details

Commits on Apr 19, 2020

  1. Merge pull request #85499 from bhipple/u/dnnl

    @Mic92
    Mic92 authored Apr 19, 2020
    Copy the full SHA
    6cfb2c8 View commit details
Showing with 11 additions and 26 deletions.
  1. +0 −13 pkgs/development/libraries/dnnl/bash-to-sh.patch
  2. +11 −13 pkgs/development/libraries/dnnl/default.nix
13 changes: 0 additions & 13 deletions pkgs/development/libraries/dnnl/bash-to-sh.patch
View file

This file was deleted.

24 changes: 11 additions & 13 deletions pkgs/development/libraries/dnnl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:

# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
# just recently been renamed again to oneDNN. In a follow-up, let's move the
# attr and alias dnnl -> oneDNN. See here for details:
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "dnnl";
version = "1.2.2";
version = "1.4";

src = fetchFromGitHub {
owner = "intel";
repo = "mkl-dnn";
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m";
sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9";
};

# Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631
# Delete after next release
patches = [ (substituteAll {
src = ./bash-to-sh.patch;
inherit bash;
}) ];

outputs = [ "out" "dev" "doc" ];

nativeBuildInputs = [ cmake ];
@@ -36,8 +33,9 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
description = "Deep Neural Network Library (DNNL)";
homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
description = "oneAPI Deep Neural Network Library (oneDNN)";
homepage = "https://01.org/dnnl";
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ alexarice bhipple ];