Skip to content

Commit 95d8f3f

Browse files
committed
fix ci issues to setup environment
Signed-off-by: jiseong.oh <[email protected]>
1 parent 527440c commit 95d8f3f

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.ci/scripts/setup-samsung-linux-deps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ download_ai_lite_core() {
3030
}
3131

3232
install_enn_backend() {
33-
# Please export ANDROID_NDK_ROOT if enable on-device test
33+
# build Exynos backend
34+
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/ndk}
35+
bash backends/samsung/build.sh --build all
36+
# set env variable
3437
export EXECUTORCH_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
35-
36-
# Remove --build and add --ndk parameter if enable on-device test
37-
bash backends/samsung/build.sh --build x86_64
3838
export PYTHONPATH=${PYTHONPATH:-}:${EXECUTORCH_ROOT}/..
3939
}
4040

.github/workflows/pull.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@ jobs:
873873
id-token: write
874874
contents: read
875875
with:
876-
runner: linux.arm64.2xlarge
877-
docker-image: ci-image:executorch-ubuntu-22.04-gcc11-aarch64
876+
runner: linux.2xlarge
877+
docker-image: ci-image:executorch-ubuntu-22.04-gcc9
878878
submodules: 'recursive'
879879
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
880880
timeout: 90

backends/samsung/aot/wrappers/op_param_wrapper.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ class OpParamWrapper {
7373

7474
template <typename T>
7575
void SetScalarValue(T value) {
76-
auto bytes_ = sizeof(T);
77-
storage_ = std::unique_ptr<uint8_t[]>(new uint8_t[bytes_]);
78-
memcpy(storage_.get(), &value, bytes_);
76+
auto bytes = sizeof(T);
77+
storage_ = std::unique_ptr<uint8_t[]>(new uint8_t[bytes]);
78+
memcpy(storage_.get(), &value, bytes);
7979
size_ = 1;
8080
is_scalar_ = true;
8181
scalar_type_ = ScalarTypeCast<T>::value;
8282
}
8383

8484
template <typename T>
8585
void SetVectorValue(const std::vector<T>& value) {
86-
auto bytes_ = sizeof(T) * value.size();
87-
storage_ = std::unique_ptr<uint8_t[]>(new uint8_t[bytes_]);
88-
memcpy(storage_.get(), value.data(), bytes_);
86+
auto bytes = sizeof(std::string::value_type) * value.size();
87+
storage_ = std::unique_ptr<uint8_t[]>(new uint8_t[bytes]);
88+
memcpy(storage_.get(), value.data(), bytes);
8989
size_ = value.size();
9090
is_scalar_ = false;
9191
scalar_type_ = ScalarTypeCast<T>::value;
@@ -114,7 +114,6 @@ class OpParamWrapper {
114114
std::string key_name_;
115115
std::unique_ptr<uint8_t[]> storage_ = nullptr;
116116
uint32_t size_ = 0;
117-
uint32_t bytes_ = 0;
118117
bool is_scalar_ = false;
119118
ScalarType scalar_type_ = ScalarType::UNKNOWN;
120119
};

0 commit comments

Comments
 (0)