mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
Merge pull request #108379 from SuperSandro2000/cleanups
This commit is contained in:
commit
f53c431645
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
|
||||
};
|
||||
|
||||
buildInputs = if mpi then [ pkgs.openmpi ] else [];
|
||||
buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ];
|
||||
|
||||
# TODO darwin, AVX and AVX2 makefile targets
|
||||
buildPhase = if mpi then ''
|
||||
|
@ -1,8 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, llvmPackages, enableAVX ? false }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages
|
||||
, enableAVX ? stdenv.hostPlatform.avxSupport
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NGT";
|
||||
version = "v1.12.3-alpha";
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yahoojapan";
|
||||
@ -11,11 +16,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ llvmPackages.openmp ];
|
||||
NIX_ENFORCE_NO_NATIVE=! enableAVX;
|
||||
__AVX2__ = if enableAVX then 1 else 0;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
NIX_ENFORCE_NO_NATIVE = ! enableAVX;
|
||||
__AVX2__ = if enableAVX then 1 else 0;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/yahoojapan/NGT";
|
||||
|
@ -14,11 +14,12 @@
|
||||
, ocl-icd ? null
|
||||
, gperftools ? null
|
||||
, eigen ? null
|
||||
, enableAVX2 ? false
|
||||
, enableAVX2 ? stdenv.hostPlatform.avx2Support
|
||||
, enableBigBoards ? false
|
||||
, enableCuda ? false
|
||||
, enableGPU ? true
|
||||
, enableTcmalloc ? true}:
|
||||
, enableTcmalloc ? true
|
||||
}:
|
||||
|
||||
assert !enableGPU -> (
|
||||
eigen != null &&
|
||||
@ -103,8 +104,6 @@ in env.mkDerivation rec {
|
||||
--prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Go engine modeled after AlphaGo Zero";
|
||||
homepage = "https://github.com/lightvector/katago";
|
||||
|
@ -23453,7 +23453,7 @@ in
|
||||
|
||||
nedit = callPackage ../applications/editors/nedit { };
|
||||
|
||||
ngt = callPackage ../development/libraries/ngt { enableAVX = false; };
|
||||
ngt = callPackage ../development/libraries/ngt { };
|
||||
|
||||
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user