diff options
| -rw-r--r-- | ports/flashlight-cuda/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/flashlight-cuda/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/flashlight-cuda.json | 5 |
4 files changed, 17 insertions, 10 deletions
diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index d61bcdc80..982269b8f 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -1,14 +1,14 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight-cpu") - message(FATAL_ERROR "flashlight-cpu is installed; only one Flashlight " - "backend package can be installed at once. Uninstall and try again:" - "\n vcpkg remove flashlight-cpu\n") +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight") + message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda" + "can be installed at once. Uninstall and try again:" + "\n vcpkg remove flashlight-cuda\n") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO flashlight/flashlight - REF 76f7fa7f5a162c73d6bf8befdb8e197a4dc7515d # 0.3 branch tip - SHA512 87786f9443d27ac9b513cf582caea13dccfa344e55a4970c0c2c7df7530260ad38cc578690ebf2fa256e8ea943abea547e0e6d5ee0ba090b336c4f7af8d2f53f + REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip + SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa HEAD_REF master ) @@ -32,7 +32,7 @@ vcpkg_check_features( imgclass FL_BUILD_APP_IMGCLASS lm FL_BUILD_APP_LM objdet FL_BUILD_APP_OBJDET - ) +) # Build and install vcpkg_configure_cmake( @@ -44,6 +44,8 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight-cuda TARGET_PATH share/flashlight) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -71,7 +73,7 @@ if ("lm" IN_LIST FEATURES) fl_lm_dictionary_builder fl_lm_train fl_lm_test - ) + ) endif() list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) if (NUM_TOOLS GREATER 0) diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index 9e53542b2..efb4159cb 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,6 +1,7 @@ { "name": "flashlight-cuda", "version": "0.3", + "port-version": 1, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "supports": "!(windows | osx)", @@ -27,7 +28,6 @@ "dependencies": [ { "name": "arrayfire", - "default-features": false, "features": [ "cuda" ] diff --git a/versions/baseline.json b/versions/baseline.json index 86709f37b..b428bbab5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2002,7 +2002,7 @@ }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 0 + "port-version": 1 }, "flatbuffers": { "baseline": "1.12.0", diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index 4ac67a703..f69285781 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9147d15ccbb61b2de168a8cc78527341edf1540d", + "version": "0.3", + "port-version": 1 + }, + { "git-tree": "bd616669b5eb7413794d727b9909309ae686cd04", "version": "0.3", "port-version": 0 |