diff options
| author | Jacob Kahn <jacobkahn1@gmail.com> | 2021-04-28 19:27:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 17:27:44 -0700 |
| commit | 81bcfa90bce04462b9e7806934b264a226aff307 (patch) | |
| tree | b181d94930184414b6606007f97cf796012bdba4 | |
| parent | 345921bce4ee724d4c5b164eb93d051667d2d990 (diff) | |
| download | vcpkg-81bcfa90bce04462b9e7806934b264a226aff307.tar.gz vcpkg-81bcfa90bce04462b9e7806934b264a226aff307.zip | |
[flashlight-cuda] update port to v0.3 (#17378)
* [flashlight-cuda] update port
* Update versions
* 0.3 tip
* version-string --> version, remove port-version
* Commit with --overwrite-version
* Update versions/f-/flashlight-cuda.json
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/flashlight-cuda/portfile.cmake | 22 | ||||
| -rw-r--r-- | ports/flashlight-cuda/vcpkg.json | 17 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/flashlight-cuda.json | 5 |
4 files changed, 38 insertions, 8 deletions
diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index b21f393da..d61bcdc80 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -6,9 +6,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO facebookresearch/flashlight - REF 81c4d8d5ea57e9ceaa6db3b17f0861491fd31383 - SHA512 988da269be81f7b4897d72e52683259f4223029b5012150958b9b21c7103fe49a2458ffa5623ed53c125a98f7294541af46cd68b17e9213269e5a2aecfaabb67 + REPO flashlight/flashlight + REF 76f7fa7f5a162c73d6bf8befdb8e197a4dc7515d # 0.3 branch tip + SHA512 87786f9443d27ac9b513cf582caea13dccfa344e55a4970c0c2c7df7530260ad38cc578690ebf2fa256e8ea943abea547e0e6d5ee0ba090b336c4f7af8d2f53f HEAD_REF master ) @@ -31,7 +31,8 @@ vcpkg_check_features( asr FL_BUILD_APP_ASR imgclass FL_BUILD_APP_IMGCLASS lm FL_BUILD_APP_LM -) + objdet FL_BUILD_APP_OBJDET + ) # Build and install vcpkg_configure_cmake( @@ -49,7 +50,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Binaries/tools set(FLASHLIGHT_TOOLS "") if ("imgclass" IN_LIST FEATURES) - list(APPEND FLASHLIGHT_TOOLS fl_img_imagenet_resnet34) + list(APPEND FLASHLIGHT_TOOLS + fl_img_imagenet_resnet34 + fl_img_imagenet_eval + fl_img_imagenet_vit + ) endif() if ("asr" IN_LIST FEATURES) list(APPEND FLASHLIGHT_TOOLS @@ -58,10 +63,15 @@ if ("asr" IN_LIST FEATURES) fl_asr_decode fl_asr_align fl_asr_voice_activity_detection_ctc + fl_asr_arch_benchmark ) endif() if ("lm" IN_LIST FEATURES) - list(APPEND FLASHLIGHT_TOOLS fl_lm_train fl_lm_dictionary_builder) + list(APPEND FLASHLIGHT_TOOLS + 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 ca24ddc72..9e53542b2 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flashlight-cuda", - "version-string": "20210111", + "version": "0.3", "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "supports": "!(windows | osx)", @@ -57,6 +57,7 @@ "description": "flashlight libraries", "dependencies": [ "cub", + "cuda", "fftw3", "intel-mkl", "kenlm" @@ -74,6 +75,20 @@ }, "gflags" ] + }, + "objdet": { + "description": "flashlight object detection app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "imgclass", + "lib" + ] + }, + "gflags" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 57706be6d..208c954a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1985,7 +1985,7 @@ "port-version": 0 }, "flashlight-cuda": { - "baseline": "20210111", + "baseline": "0.3", "port-version": 0 }, "flatbuffers": { diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index 71400ff3c..4ac67a703 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "bd616669b5eb7413794d727b9909309ae686cd04", + "version": "0.3", + "port-version": 0 + }, + { "git-tree": "b4308769591bc2d877cb5a2e829e7dfd64086c54", "version-string": "20210111", "port-version": 0 |