Selaa lähdekoodia

Using AWS Bedrock-Runtime instead of AWS Bedrock. The runtime allows for invoking existing models vs Bedrock which is used for creating new models

Signed-off-by: AMZN-Gene <[email protected]>
AMZN-Gene 1 vuosi sitten
vanhempi
commit
fd29dd51b2

+ 3 - 3
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Android

@@ -142,12 +142,12 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
-#### Bedrock ####
+#### BedrockRuntime ####
 ly_declare_aws_library(
     NAME 
-        Bedrock
+        BedrockRuntime
     LIB_FILE 
-        aws-cpp-sdk-bedrock
+        aws-cpp-sdk-bedrock-runtime
     BUILD_DEPENDENCIES
         # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
         3rdParty::AWSNativeSDK::Core 

+ 3 - 3
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux

@@ -127,12 +127,12 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
-#### Bedrock ####
+#### BedrockRuntime ####
 ly_declare_aws_library(
     NAME 
-        Bedrock
+        BedrockRuntime
     LIB_FILE 
-        aws-cpp-sdk-bedrock
+        aws-cpp-sdk-bedrock-runtime
     BUILD_DEPENDENCIES
         # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
         3rdParty::AWSNativeSDK::Core 

+ 3 - 3
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac

@@ -163,12 +163,12 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core
 )
 
-#### Bedrock ####
+#### BedrockRuntime ####
 ly_declare_aws_library(
     NAME
-        Bedrock
+        BedrockRuntime
     LIB_FILE 
-        aws-cpp-sdk-bedrock
+        aws-cpp-sdk-bedrock-runtime
     BUILD_DEPENDENCIES
         3rdParty::AWSNativeSDK::Core
 )

+ 3 - 3
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows

@@ -157,12 +157,12 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
-#### Bedrock ####
+#### BedrockRuntime ####
 ly_declare_aws_library(
     NAME
-        Bedrock
+        BedrockRuntime
     LIB_FILE
-        aws-cpp-sdk-bedrock
+        aws-cpp-sdk-bedrock-runtime
     BUILD_DEPENDENCIES
         # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
         3rdParty::AWSNativeSDK::Core 

+ 3 - 3
package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS

@@ -101,12 +101,12 @@ ly_declare_aws_library(
         3rdParty::AWSNativeSDK::Core 
 )
 
-#### Bedrock ####
+#### BedrockRuntime ####
 ly_declare_aws_library(
     NAME 
-        Bedrock
+        BedrockRuntime
     LIB_FILE
-        aws-cpp-sdk-bedrock
+        aws-cpp-sdk-bedrock-runtime
     BUILD_DEPENDENCIES
         # Even though AWS Core is a sibling module, make sure it's linked in first because this module depends on it.
         3rdParty::AWSNativeSDK::Core 

+ 1 - 1
package-system/AWSNativeSDK/build_AWSNativeSDK_android.cmd

@@ -62,7 +62,7 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DCPP_STANDARD=17 ^
            -DCMAKE_C_FLAGS="-fPIC" ^
            -DCMAKE_CXX_FLAGS="-fPIC" ^
-           -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
+           -DBUILD_ONLY="access-management;bedrock-runtime;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON^

+ 1 - 1
package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh

@@ -28,7 +28,7 @@ configure_and_build_static() {
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
-          -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;bedrock-runtime;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=OFF \
           -DCMAKE_BUILD_TYPE=$build_type \
           -DCURL_LIBRARY="temp/curl_install/lib/libcurl.a" \

+ 1 - 1
package-system/AWSNativeSDK/build_AWSNativeSDK_mac.sh

@@ -33,7 +33,7 @@ configure_and_build() {
           -DENABLE_TESTING=OFF \
           -DENABLE_RTTI=ON \
           -DCUSTOM_MEMORY_MANAGEMENT=ON \
-          -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
+          -DBUILD_ONLY="access-management;bedrock-runtime;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
           -DBUILD_SHARED_LIBS=$build_shared \
           -DCMAKE_BUILD_TYPE=$build_type \
           -DCMAKE_INSTALL_BINDIR="bin" \

+ 1 - 1
package-system/AWSNativeSDK/build_AWSNativeSDK_windows.cmd

@@ -58,7 +58,7 @@ call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
            -DTARGET_ARCH=WINDOWS ^
            -DCMAKE_CXX_STANDARD=17 ^
            -DCPP_STANDARD=17 ^
-           -DBUILD_ONLY="access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
+           -DBUILD_ONLY="access-management;bedrock-runtime;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
            -DENABLE_TESTING=OFF ^
            -DENABLE_RTTI=ON ^
            -DCUSTOM_MEMORY_MANAGEMENT=ON ^

+ 1 - 1
package-system/AWSNativeSDK/docker_build_aws_sdk.sh

@@ -160,7 +160,7 @@ configure_and_build() {
  -DENABLE_TESTING=OFF \
  -DENABLE_RTTI=ON \
  -DCUSTOM_MEMORY_MANAGEMENT=ON \
- -DBUILD_ONLY=\"access-management;bedrock;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer\" \
+ -DBUILD_ONLY=\"access-management;bedrock-runtime;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer\" \
  -DBUILD_SHARED_LIBS=$build_shared \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_BINDIR=\"bin\" \