Clean up

Author: haochengxia

.github/workflows/build.yml

@@ -20,14 +20,10 @@ jobs:
       - name: Configure CMake
         run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
       - name: Build
-        run: |
-          cores=$(sysctl -n hw.ncpu)
-          ninja -C ${{github.workspace}}/build -j$((cores + 1))
+        run: ninja -C ${{github.workspace}}/build
       - name: Test
         working-directory: ${{github.workspace}}/build
-        run: |
-          cores=$(sysctl -n hw.ncpu)
-          ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel $cores
+        run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel
 
   ubuntu:
     runs-on: ubuntu-latest
@@ -42,15 +38,12 @@ jobs:
                 -DCMAKE_C_FLAGS="-fsanitize=leak" \
                 -DCMAKE_CXX_FLAGS="-fsanitize=leak"
       - name: Build
-        run: |
-          cores=$(nproc)
-          ninja -C ${{github.workspace}}/build -j$((cores + 1))
+        run: ninja -C ${{github.workspace}}/build
       - name: Test with LSan
         working-directory: ${{github.workspace}}/build
         run: |
           export ASAN_OPTIONS="detect_leaks=1:halt_on_error=1:verbosity=1"
-          cores=$(nproc)
-          ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel $cores
+          ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel
 
   selfhosted:
     runs-on: self-hosted
@@ -59,11 +52,7 @@ jobs:
       - name: Configure CMake
         run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_GLCACHE=on -DENABLE_LRB=on
       - name: Build
-        run: |
-          cores=$(nproc)
-          ninja -C ${{github.workspace}}/build -j$((cores + 1))
+        run: ninja -C ${{github.workspace}}/build
       - name: Test
         working-directory: ${{github.workspace}}/build
-        run: |
-          cores=$(nproc)
-          ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel $cores
+        run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure --parallel

scripts/install_dependency.sh

@@ -158,7 +158,6 @@ install_cmake() {
 # Install XGBoost
 install_xgboost() {
 	log_info "Installing XGBoost..."
-	local cores=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
 	pushd /tmp/ >/dev/null
 	if [[ ! -d "xgboost" ]]; then
 		git clone --recursive https://github.com/dmlc/xgboost
@@ -167,7 +166,7 @@ install_xgboost() {
 	mkdir -p build
 	pushd build >/dev/null
 	cmake -G Ninja ..
-	ninja -j$((cores + 1))
+	ninja
 	sudo ninja install
 	popd >/dev/null
 	popd >/dev/null
@@ -177,7 +176,6 @@ install_xgboost() {
 # Install LightGBM
 install_lightgbm() {
 	log_info "Installing LightGBM..."
-	local cores=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
 	pushd /tmp/ >/dev/null
 	if [[ ! -d "LightGBM" ]]; then
 		git clone --recursive https://github.com/microsoft/LightGBM
@@ -186,7 +184,7 @@ install_lightgbm() {
 	mkdir -p build
 	pushd build >/dev/null
 	cmake -G Ninja ..
-	ninja -j$((cores + 1))
+	ninja
 	sudo ninja install
 	popd >/dev/null
 	popd >/dev/null
@@ -196,7 +194,6 @@ install_lightgbm() {
 # Install Zstd
 install_zstd() {
 	log_info "Installing Zstd..."
-	local cores=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
 	pushd /tmp/ >/dev/null
 	local zstd_version="1.5.0"
 	if [[ ! -f "zstd-${zstd_version}.tar.gz" ]]; then
@@ -207,7 +204,7 @@ install_zstd() {
 	mkdir -p _build
 	pushd _build >/dev/null
 	cmake -G Ninja ..
-	ninja -j$((cores + 1))
+	ninja
 	sudo ninja install
 	popd >/dev/null
 	popd >/dev/null