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: d49615dc55df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e231564fc419
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 23, 2020

  1. dnnl: rename to oneDNN to track upstream project rename 

    See the link in the default.nix file for details.  This adds an alias for
backwards compatibility.
    @bhipple
    bhipple committed Apr 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bab9dab View commit details

Commits on May 6, 2020

  1. Merge pull request #85839 from bhipple/u/dnnl-oneDNN 

    dnnl: rename to oneDNN to track upstream project rename
    @markuskowa
    markuskowa authored May 6, 2020
    Copy the full SHA
    e231564 View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −4 pkgs/development/libraries/{dnnl → oneDNN}/default.nix
  2. +1 −0 pkgs/top-level/aliases.nix
  3. +2 −2 pkgs/top-level/all-packages.nix
7 changes: 3 additions & 4 deletions pkgs/development/libraries/dnnl/default.nix → .../development/libraries/oneDNN/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
{ stdenv, lib, fetchFromGitHub, cmake }:

# 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:
# just recently been renamed again to oneDNN. See here for details:
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "dnnl";
pname = "oneDNN";
version = "1.4";

src = fetchFromGitHub {
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -100,6 +100,7 @@ mapAliases ({
devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18
dmtx = dmtx-utils; # added 2018-04-25
dnnl = oneDNN; # added 2020-04-22
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11411,8 +11411,6 @@ in

dhex = callPackage ../applications/editors/dhex { };

dnnl = callPackage ../development/libraries/dnnl { };

double-conversion = callPackage ../development/libraries/double-conversion { };

dclib = callPackage ../development/libraries/dclib { };
@@ -13772,6 +13770,8 @@ in

one_gadget = callPackage ../development/tools/misc/one_gadget { };

oneDNN = callPackage ../development/libraries/oneDNN { };

onedrive = callPackage ../applications/networking/sync/onedrive { };

oneko = callPackage ../applications/misc/oneko { };