Unverified Commit eae24e47 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #316269 from g00pix/bump-dlib

dlib: 19.24.2 -> 19.24.4
parents 24c5f202 3a8211a3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@
}@inputs:
(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
  pname = "dlib";
  version = "19.24.2";
  version = "19.24.4";

  src = fetchFromGitHub {
    owner = "davisking";
    repo = "dlib";
    rev = "v${version}";
    sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
    sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc=";
  };

  postPatch = ''
+5 −3
Original line number Diff line number Diff line
diff --git a/setup.py b/setup.py
index 0c8d8f16..565ef8ef 100644
index 219583b..3ca5f88 100644
--- a/setup.py
+++ b/setup.py
@@ -172,21 +172,7 @@ class CMakeBuild(build_ext):
@@ -170,23 +170,7 @@ class CMakeBuild(build_ext):
         subprocess.check_call(cmake_build, cwd=build_folder)
 
 def num_available_cpu_cores(ram_per_build_process_in_gb):
@@ -10,6 +10,8 @@ index 0c8d8f16..565ef8ef 100644
-        # When building on travis-ci, just use 2 cores since travis-ci limits
-        # you to that regardless of what the hardware might suggest.
-        return 2
-    elif 'CMAKE_BUILD_PARALLEL_LEVEL' in os.environ and os.environ['CMAKE_BUILD_PARALLEL_LEVEL'].isnumeric():
-        return int(os.environ['CMAKE_BUILD_PARALLEL_LEVEL'])
-    try:
-        mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')  
-        mem_gib = mem_bytes/(1024.**3)