Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Application] Bug fix about meson setting @open sesame 06/10 13:02 #2627

Merged
merged 1 commit into from
Jun 21, 2024
Merged

[Application] Bug fix about meson setting @open sesame 06/10 13:02 #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Applications/LLaMA/jni/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <swiglu.h>
#include <transpose_layer.h>

#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
#include "json.hpp"
#include <codecvt>
#include <encoder.hpp>
Expand Down Expand Up @@ -572,7 +572,7 @@ void run(std::string text, bool apply_temperature) {

unsigned int init_len;

#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
std::string vocab_file_name = "../Applications/LLaMA/jni/vocab.json";
std::string merge_file_name = "../Applications/LLaMA/jni/merges.txt";

Expand Down Expand Up @@ -619,7 +619,7 @@ void run(std::string text, bool apply_temperature) {
std::cout << " Progress Reading: 100 % " << std::endl;
std::cout << std::endl << "### Output : " << std::endl;
if (init_len < INIT_SEQ_LEN) {
#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
auto decoded_str = tokenizer.decode({static_cast<int64_t>(ids)});
std::cout << decoded_str << " ";
std::cout.flush();
Expand All @@ -635,7 +635,7 @@ void run(std::string text, bool apply_temperature) {
input_sample[0] = static_cast<float>(init_input[i]);
} else {
input_sample[0] = static_cast<float>(ids);
#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
auto decoded_str = tokenizer.decode({static_cast<int64_t>(ids)});
std::cout << decoded_str << " ";
std::cout.flush();
Expand Down Expand Up @@ -684,7 +684,7 @@ void createAndRun(unsigned int epochs, unsigned int batch_size) {
g_model->load(weight_path);
}

#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
std::wstring decodeUnicodeEscape(const std::wstring &input) {
std::wstringstream result;

Expand Down Expand Up @@ -712,7 +712,7 @@ int main(int argc, char *argv[]) {
// Setting locale
std::locale::global(std::locale("ko_KR.UTF-8"));

#if defined(ENABLE_ENCODER2)
#if defined(DENABLE_ENCODER)
// Getting arguments From terminal
std::wstring input;
std::getline(std::wcin, input);
Expand Down
1 change: 0 additions & 1 deletion Applications/LLaMA/jni/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ transpose_dep = declare_dependency(
)

if get_option('platform') != 'tizen'
extra_defines += '-DENABLE_ENCODER2=1'
run_command(meson.source_root() / 'jni' / 'prepare_encoder.sh', meson.build_root(), '0.2' ,check: true)
endif

Expand Down
8 changes: 4 additions & 4 deletions Applications/PicoGPT/jni/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <string.h>
#include <tensor.h>

#if defined(ENABLE_ENCODER)
#if defined(DENABLE_ENCODER)
#include "encoder.hpp"
#endif

Expand All @@ -43,7 +43,7 @@ bool optimize = false;
// bool optimize = true;
bool optimize_attention = false;

#if defined(ENABLE_ENCODER)
#if defined(DENABLE_ENCODER)
template <typename T>
T unwrap(std::optional<T> &&value, const std::string &error_msg) {
if (value.has_value()) {
Expand Down Expand Up @@ -318,7 +318,7 @@ int main(int argc, char *argv[]) {

std::vector<int64_t> init_input;

#if defined(ENABLE_ENCODER)
#if defined(DENABLE_ENCODER)

std::string vocab_file_name = "../Applications/PicoGPT/jni/vocab.json";
std::string merge_file_name = "../Applications/PicoGPT/jni/merges.txt";
Expand Down Expand Up @@ -372,7 +372,7 @@ int main(int argc, char *argv[]) {

((uint *)(wpe_input))[0] = i;

#if defined(ENABLE_ENCODER)
#if defined(DENABLE_ENCODER)
std::vector<int64_t> token_ids;
for (auto element : ids) {
token_ids.push_back(static_cast<int64_t>(element));
Expand Down
1 change: 0 additions & 1 deletion Applications/PicoGPT/jni/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ nntr_pico_gpt_resdir = nntr_app_resdir / 'PicoGPT'
run_command('cp', '-lr', res_path, nntr_pico_gpt_resdir)

if get_option('platform') != 'tizen'
extra_defines += '-DENABLE_ENCODER=1'
run_command(meson.source_root() / 'jni' / 'prepare_encoder.sh', meson.build_root(), '0.1' , check: true)
endif

Expand Down
2 changes: 2 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ if get_option('platform') == 'tizen'
if get_option('enable-tizen-feature-check')
add_project_arguments('-D__FEATURE_CHECK_SUPPORT__', language: ['c', 'cpp'])
endif
elif get_option('platform') == 'android'
add_project_arguments('-DENABLE_ENCODER=1', language: ['c', 'cpp'])
endif

warning_flags = [
Expand Down