diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a673de68..997dd9d1 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -104,6 +104,26 @@ jobs: path: ${{ github.workspace }}/uselib* + linux-build-no-opencv-cpp-mode: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + # Install latest CMake. + - uses: lukka/get-cmake@latest + + - name: 'Build with CMake and Ninja' + uses: lukka/run-cmake@v2 + with: + cmakeListsOrSettingsJson: CMakeListsTxtAdvanced + cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' + useVcpkgToolchainFile: true + buildDirectory: '${{ runner.workspace }}/buildDirectory' + cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=Release -DBUILD_AS_CPP:BOOL=TRUE" + cmakeBuildType: 'Release' + buildWithCMakeArgs: '--target install' + + macos-build-vcpkg: runs-on: macOS-latest steps: @@ -201,6 +221,26 @@ jobs: path: ${{ github.workspace }}/uselib* + macos-build-no-opencv-no-omp-cpp-mode: + runs-on: macOS-latest + steps: + - uses: actions/checkout@v2 + + # Install latest CMake. + - uses: lukka/get-cmake@latest + + - name: 'Build with CMake and Ninja' + uses: lukka/run-cmake@v2 + with: + cmakeListsOrSettingsJson: CMakeListsTxtAdvanced + cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' + useVcpkgToolchainFile: true + buildDirectory: '${{ runner.workspace }}/buildDirectory' + cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=Release -DBUILD_AS_CPP:BOOL=TRUE" + cmakeBuildType: 'Release' + buildWithCMakeArgs: '--target install' + + windows-build-vcpkg: runs-on: windows-latest steps: @@ -247,7 +287,71 @@ jobs: with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/*dark* + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: ${{ runner.workspace }}/buildDirectory/*.dll - uses: actions/upload-artifact@v2 with: name: darknet-vcpkg-${{ runner.os }} path: ${{ github.workspace }}/uselib* + + + windows-build-integrated-libs: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + + # Install latest CMake. + - uses: lukka/get-cmake@latest + + - name: 'Build with CMake and Ninja' + uses: lukka/run-cmake@v2 + with: + cmakeListsOrSettingsJson: CMakeListsTxtAdvanced + cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' + useVcpkgToolchainFile: true + buildDirectory: '${{ runner.workspace }}/buildDirectory' + cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=Release" + cmakeBuildType: 'Release' + buildWithCMakeArgs: '--target install' + + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: cfg + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: data + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: ${{ github.workspace }}/*dark* + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: ${{ github.workspace }}/3rdparty/pthreads/bin/*.dll + - uses: actions/upload-artifact@v2 + with: + name: darknet-vcpkg-${{ runner.os }} + path: ${{ github.workspace }}/uselib* + + windows-build-integrated-libs-cpp-mode: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + + # Install latest CMake. + - uses: lukka/get-cmake@latest + + - name: 'Build with CMake and Ninja' + uses: lukka/run-cmake@v2 + with: + cmakeListsOrSettingsJson: CMakeListsTxtAdvanced + cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' + useVcpkgToolchainFile: true + buildDirectory: '${{ runner.workspace }}/buildDirectory' + cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=Release -DBUILD_AS_CPP:BOOL=TRUE" + cmakeBuildType: 'Release' + buildWithCMakeArgs: '--target install' diff --git a/appveyor.yml b/appveyor.yml index 9c6f279f..68aea5d5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,20 +10,20 @@ environment: COMPILER: cygwin CYGWIN_NOWINPATH: yes CYGSH: C:\cygwin64\bin\bash -c - - platform: Win64 - USE_CUDA: yes - INSTALL_CUDA_VERSION: 10.0 - COMPILER: vs - configuration: Release - VCPKG_ROOT: C:\Tools\vcpkg - VCPKG_DEFAULT_TRIPLET: x64-windows - - platform: Win64 - USE_CUDA: yes - INSTALL_CUDA_VERSION: 10.1 - COMPILER: vs - configuration: Release - VCPKG_ROOT: C:\Tools\vcpkg - VCPKG_DEFAULT_TRIPLET: x64-windows + #- platform: Win64 + # USE_CUDA: yes + # INSTALL_CUDA_VERSION: 10.0 + # COMPILER: vs + # configuration: Release + # VCPKG_ROOT: C:\Tools\vcpkg + # VCPKG_DEFAULT_TRIPLET: x64-windows + #- platform: Win64 + # USE_CUDA: yes + # INSTALL_CUDA_VERSION: 10.1 + # COMPILER: vs + # configuration: Release + # VCPKG_ROOT: C:\Tools\vcpkg + # VCPKG_DEFAULT_TRIPLET: x64-windows #- platform: Win64 # USE_CUDA: yes # INSTALL_CUDA_VERSION: 10.2 @@ -31,23 +31,23 @@ environment: # configuration: Release # VCPKG_ROOT: C:\Tools\vcpkg # VCPKG_DEFAULT_TRIPLET: x64-windows - - platform: Win64 - USE_CUDA: no - COMPILER: vs - configuration: Release - VCPKG_ROOT: C:\Tools\vcpkg - VCPKG_DEFAULT_TRIPLET: x64-windows - - platform: Win64 - USE_CUDA: no - COMPILER: vs - configuration: Release - USE_INTEGRATED_LIBS: yes - - platform: Win64 - USE_CUDA: no - COMPILER: vs - configuration: Release - USE_INTEGRATED_LIBS: yes - FORCE_CPP: yes + #- platform: Win64 + # USE_CUDA: no + # COMPILER: vs + # configuration: Release + # VCPKG_ROOT: C:\Tools\vcpkg + # VCPKG_DEFAULT_TRIPLET: x64-windows + #- platform: Win64 + # USE_CUDA: no + # COMPILER: vs + # configuration: Release + # USE_INTEGRATED_LIBS: yes + #- platform: Win64 + # USE_CUDA: no + # COMPILER: vs + # configuration: Release + # USE_INTEGRATED_LIBS: yes + # FORCE_CPP: yes install: - if [%COMPILER%]==[vs] cinst cmake ninja