Skip to content

Commit 65c41b8

Browse files
[3.10+][1/n] Add conditional archiving for libmpdec module
Summary: Test Plan: Reviewers: Subscribers: Tasks: Tags:
1 parent 1dd266c commit 65c41b8

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

multipy/runtime/interpreter/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,20 @@ SET(PYTHON_MODULE_DIR "${SOURCE_DIR}/build/temp.linux-x86_64-{CPYTHON_VERSION}/$
5353
SET(PYTHON_STDLIB_DIR "${SOURCE_DIR}/Lib")
5454
SET(PYTHON_STDLIB "${PYTHON_INSTALL_DIR}/lib/libpython_stdlib{CPYTHON_VERSION}.a")
5555

56+
if(${CPYTHON_VERSION} MATCHES "3\.[8-9]")
57+
SET(PYTHON_MEM_MODULE "${PYTHON_MODULE_DIR}/_decimal/libmpdec/memory.o")
58+
elseif(${CPYTHON_VERSION} MATCHES "3\.1[0-1]")
59+
SET(PYTHON_MEM_MODULE "${PYTHON_MODULE_DIR}/_decimal/libmpdec/mpalloc.o")
60+
endif()
61+
5662
# Then we use a hardcoded list of expected module names and include them in our lib
5763
include("CMakePythonModules.txt")
5864
ExternalProject_Add_Step(
5965
cpython
6066
archive_stdlib
6167
DEPENDEES install
6268
BYPRODUCTS ${PYTHON_STDLIB}
63-
COMMAND ar -rc ${PYTHON_STDLIB} ${PYTHON_MODULES}
69+
COMMAND ar -rc ${PYTHON_STDLIB} ${PYTHON_MODULES} ${PYTHON_MEM_MODULE}
6470
VERBATIM
6571
)
6672
# Get python typing extension, needed by torch

multipy/runtime/interpreter/CMakePythonModules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SET(PYTHON_MODULES
2222
${PYTHON_MODULE_DIR}/_cursesmodule.o
2323
${PYTHON_MODULE_DIR}/_curses_panel.o
2424
${PYTHON_MODULE_DIR}/_datetimemodule.o
25-
${PYTHON_MODULE_DIR}/_decimal/_decimal.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/basearith.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/constants.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/context.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/convolute.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/crt.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/difradix2.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/fnt.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/fourstep.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/io.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/memory.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/mpdecimal.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/numbertheory.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/sixstep.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/transpose.o
25+
${PYTHON_MODULE_DIR}/_decimal/_decimal.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/basearith.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/constants.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/context.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/convolute.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/crt.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/difradix2.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/fnt.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/fourstep.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/io.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/mpdecimal.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/numbertheory.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/sixstep.o ${PYTHON_MODULE_DIR}/_decimal/libmpdec/transpose.o
2626
${PYTHON_MODULE_DIR}/_elementtree.o
2727
${PYTHON_MODULE_DIR}/fcntlmodule.o
2828
${PYTHON_MODULE_DIR}/grpmodule.o

0 commit comments

Comments
 (0)