Unverified Commit f5412e5f authored by Luke Petre's avatar Luke Petre Committed by GitHub
Browse files

Support building using the manylinux docker image. (#586)



* Support building using the manylinux docker image. libpython is only required for embedded python.
Signed-off-by: default avatarLuke Petre <lpetre@midjourney.com>

* Be explicit about which python to use in cmake
Signed-off-by: default avatarLuke Petre <lpetre@midjourney.com>

* Remove cmake version check
Co-authored-by: default avatarTim Moon <4406448+timmoon10@users.noreply.github.com>
Signed-off-by: default avatarLuke Petre <lpetre@gmail.com>

---------
Signed-off-by: default avatarLuke Petre <lpetre@midjourney.com>
Signed-off-by: default avatarLuke Petre <lpetre@gmail.com>
Co-authored-by: default avatarTim Moon <4406448+timmoon10@users.noreply.github.com>
parent 904e7ba7
...@@ -11,6 +11,7 @@ import shutil ...@@ -11,6 +11,7 @@ import shutil
import subprocess import subprocess
from subprocess import CalledProcessError from subprocess import CalledProcessError
import sys import sys
import sysconfig
import tempfile import tempfile
from typing import List, Optional, Tuple, Union from typing import List, Optional, Tuple, Union
...@@ -327,6 +328,8 @@ class CMakeExtension(setuptools.Extension): ...@@ -327,6 +328,8 @@ class CMakeExtension(setuptools.Extension):
cmake_path, cmake_path,
"-B", "-B",
build_dir, build_dir,
f"-DPython_EXECUTABLE={sys.executable}",
f"-DPython_INCLUDE_DIR={sysconfig.get_path('include')}",
f"-DCMAKE_BUILD_TYPE={build_type}", f"-DCMAKE_BUILD_TYPE={build_type}",
f"-DCMAKE_INSTALL_PREFIX={install_dir}", f"-DCMAKE_INSTALL_PREFIX={install_dir}",
] ]
......
...@@ -22,7 +22,7 @@ endif() ...@@ -22,7 +22,7 @@ endif()
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
find_package(CUDAToolkit REQUIRED cublas nvToolsExt) find_package(CUDAToolkit REQUIRED cublas nvToolsExt)
find_package(CUDNN REQUIRED cudnn) find_package(CUDNN REQUIRED cudnn)
find_package(Python COMPONENTS Interpreter Development REQUIRED) find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment