Update FG for latest paddle and cuda #6812
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #6812 +/- ##
===========================================
- Coverage 59.92% 59.92% -0.01%
===========================================
Files 547 547
Lines 81009 81015 +6
===========================================
+ Hits 48546 48547 +1
- Misses 32463 32468 +5
|
DrownFish19
changed the title
guoshengCS
previously approved these changes
Aug 29, 2023
paddlenlp/ops/ext_utils.py
Outdated
| self.cmake_args += ["-DCMAKE_CXX_COMPILER={}".format(os.getenv("CXX_COMPILER_PATH"))] | ||
|
|
||
| self.cmake_args += ["-DPYTHON_LIBRARY={}".format(distutils.sysconfig.get_config_var("LIBDIR"))] | ||
| self.cmake_args += ["-DPYTHON_INCLUDE_DIR={}".format(distutils.sysconfig.get_python_inc())] |
There was a problem hiding this comment.
是否可以直接使用sysconfig的一些方法拿到了，distutils之前因为deprecated有想要去掉
# copy form distutils.dep_util to avoid import distutils
def newer_group(sources, target, missing="error"):
"""Return true if 'target' is out-of-date with respect to any file
listed in 'sources'. In other words, if 'target' exists and is newer
than every file in 'sources', return false; otherwise return trueThere was a problem hiding this comment.
已经修改，distutils.sysconfig功能已经导入sysconfig，直接使用import sysconfig并实现了相同输出
paddlenlp/ops/CMakeLists.txt
Outdated
| GIT_TAG nccl_dependent_refine | ||
| PREFIX ${THIRD_PATH} | ||
| SOURCE_DIR ${THIRD_PATH}/source/${THIRD_PARTY_NAME} | ||
| UPDATE_COMMAND ${FT_UPDATE_COMMAND} # PATCH_COMMAND ${FT_PATCH_COMMAND} | ||
| BINARY_DIR ${THIRD_PATH}/build/${THIRD_PARTY_NAME} | ||
| INSTALL_COMMAND "" | ||
| CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSM=${SM} -DBUILD_PD=ON -DBUILD_ENCODER=${WITH_ENCODER} -DPY_CMD=${PY_CMD} -DON_INFER=${ON_INFER} -DPADDLE_LIB=${PADDLE_LIB} -DWITH_MKL=${WITH_MKL} -DWITH_STATIC_LIB=${WITH_STATIC_LIB} -DBUILD_GPT=${WITH_PARALLEL} -DWITH_ONNXRUNTIME=${WITH_ONNXRUNTIME} | ||
| CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_COMPILER=/usr/local/gcc-12.2/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/gcc-12.2/bin/g++ -DSM=${SM} -DBUILD_PD=ON -DBUILD_ENCODER=${WITH_ENCODER} -DPY_CMD=${PY_CMD} -DON_INFER=${ON_INFER} -DPADDLE_LIB=${PADDLE_LIB} -DWITH_MKL=${WITH_MKL} -DWITH_STATIC_LIB=${WITH_STATIC_LIB} -DBUILD_GPT=${WITH_PARALLEL} -DWITH_ONNXRUNTIME=${WITH_ONNXRUNTIME} |
There was a problem hiding this comment.
这里的CMAKE_CXX_COMPILER是否要明确写死这个路径了
There was a problem hiding this comment.
已经修改，通过环境变量设置gcc和g++
guoshengCS
previously approved these changes
Aug 29, 2023
guoshengCS
approved these changes
Aug 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
Bug fixes
PR changes
Others
Description
CMakeList.txtfor latest paddle inference libary.paddlenlp/ops/fast_transformer/src/xxx.hfor latest paddle inference libary.codecvtwithutf8cppindemo/gpt.cc, sincecodecvtis deprecated in C++17.CMAKE_C_COMPILERandCMAKE_CXX_COMPILERinci_case.shto avoid system gcc 4.8.5 duringcmake.This resolves #3522