Skip to content

Commit 612e99c

Browse files
authored
Merge branch 'master' into python-3.13
2 parents a797f91 + 799199a commit 612e99c

File tree

4 files changed

+4
-1165
lines changed

4 files changed

+4
-1165
lines changed

.ci/conda-envs/ci-core-py38.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ pytest=8.2.*
3939
# pinned here to help speed up solves
4040
bokeh=3.1.*
4141
fsspec=2024.5.*
42+
# pinning 'libabseil' and 'libre2' to specific build numbers for pyarrow compatibility:
43+
# ref: https://github.com/microsoft/LightGBM/issues/6772
44+
libabseil=20240722.0=*_1
45+
libre2-11=2024.07.02=*_1
4246
msgpack-python=1.0.*
4347
pluggy=1.5.*
4448
pyparsing=3.1.4

CMakeLists.txt

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -252,54 +252,6 @@ if(USE_CUDA)
252252
set(CMAKE_CUDA_STANDARD 11)
253253
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
254254
endif()
255-
256-
set(
257-
BASE_DEFINES
258-
-DPOWER_FEATURE_WORKGROUPS=12
259-
-DUSE_CONSTANT_BUF=0
260-
)
261-
set(
262-
ALLFEATS_DEFINES
263-
${BASE_DEFINES}
264-
-DENABLE_ALL_FEATURES
265-
)
266-
set(
267-
FULLDATA_DEFINES
268-
${ALLFEATS_DEFINES}
269-
-DIGNORE_INDICES
270-
)
271-
272-
message(STATUS "ALLFEATS_DEFINES: ${ALLFEATS_DEFINES}")
273-
message(STATUS "FULLDATA_DEFINES: ${FULLDATA_DEFINES}")
274-
275-
function(add_histogram hsize hname hadd hconst hdir)
276-
add_library(histo${hsize}${hname} OBJECT src/treelearner/kernels/histogram${hsize}.cu)
277-
set_target_properties(
278-
histo${hsize}${hname}
279-
PROPERTIES
280-
CUDA_SEPARABLE_COMPILATION ON
281-
CUDA_ARCHITECTURES ${CUDA_ARCHS}
282-
)
283-
if(hadd)
284-
list(APPEND histograms histo${hsize}${hname})
285-
set(histograms ${histograms} PARENT_SCOPE)
286-
endif()
287-
target_compile_definitions(
288-
histo${hsize}${hname}
289-
PRIVATE
290-
-DCONST_HESSIAN=${hconst}
291-
${hdir}
292-
)
293-
endfunction()
294-
295-
foreach(hsize _16_64_256)
296-
add_histogram("${hsize}" "_sp_const" "True" "1" "${BASE_DEFINES}")
297-
add_histogram("${hsize}" "_sp" "True" "0" "${BASE_DEFINES}")
298-
add_histogram("${hsize}" "-allfeats_sp_const" "False" "1" "${ALLFEATS_DEFINES}")
299-
add_histogram("${hsize}" "-allfeats_sp" "False" "0" "${ALLFEATS_DEFINES}")
300-
add_histogram("${hsize}" "-fulldata_sp_const" "True" "1" "${FULLDATA_DEFINES}")
301-
add_histogram("${hsize}" "-fulldata_sp" "True" "0" "${FULLDATA_DEFINES}")
302-
endforeach()
303255
endif()
304256

305257
include(CheckCXXSourceCompiles)
@@ -634,14 +586,6 @@ if(USE_CUDA)
634586
CUDA_RESOLVE_DEVICE_SYMBOLS ON
635587
)
636588
endif()
637-
638-
# histograms are list of object libraries. Linking object library to other
639-
# object libraries only gets usage requirements, the linked objects won't be
640-
# used. Thus we have to call target_link_libraries on final targets here.
641-
if(BUILD_CLI)
642-
target_link_libraries(lightgbm PRIVATE ${histograms})
643-
endif()
644-
target_link_libraries(_lightgbm PRIVATE ${histograms})
645589
endif()
646590

647591
if(WIN32)

0 commit comments

Comments
 (0)