Skip to content

N
Ncnn

SORACE / Ncnn

通知 2
Star 0
Fork 0
N
Ncnn

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ad37c34d 编写于 作者: N nihui
浏览文件
操作

disable NCNN_ARM82DOT whenever NCNN_ARM82 disabled

上级 322812de
隐藏空白更改
内联 并排
Showing with 14 addition and 12 deletion
.github/workflows/linux-aarch64-cpu-gcc.yml
浏览文件 @ ad37c34d
......@@ -46,7 +46,7 @@ jobs:
- name: build
run: |
mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=OFF -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=OFF -DNCNN_ARM82DOT=OFF -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake --build . -j 2
- name: test
run: |
......@@ -57,7 +57,7 @@ jobs:
- name: build-noint8
run: |
mkdir build-noint8 && cd build-noint8
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=OFF -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=OFF -DNCNN_ARM82DOT=OFF -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake --build . -j 2
- name: test-noint8
run: |
......@@ -104,7 +104,7 @@ jobs:
- name: build
run: |
mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=ON -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=ON -DNCNN_ARM82DOT=ON -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON ..
cmake --build . -j 2
- name: test
run: |
......@@ -115,7 +115,7 @@ jobs:
- name: build-noint8
run: |
mkdir build-noint8 && cd build-noint8
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=ON -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON -DNCNN_INT8=OFF ..
cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake -DNCNN_ARM82=ON -DNCNN_ARM82DOT=ON -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF -DNCNN_BUILD_TESTS=ON -DNCNN_INT8=OFF ..
cmake --build . -j 2
- name: test-noint8
run: |
......
CMakeLists.txt
浏览文件 @ ad37c34d
......@@ -132,9 +132,11 @@ if((IOS AND CMAKE_OSX_ARCHITECTURES MATCHES "arm")
if(NCNN_COMPILER_SUPPORT_ARM82_FP16)
option(NCNN_ARM82 "optimize aarch64 platform with armv8.2" ON)
if(NCNN_COMPILER_SUPPORT_ARM82_FP16_DOTPROD)
option(NCNN_ARM82DOT "optimize aarch64 platform with armv8.2 dotprod." ON)
if(NCNN_ARM82)
option(NCNN_ARM82DOT "optimize aarch64 platform with armv8.2 dotprod." ON)
endif()
else()
message(WARNING "The compiler does not support armv8.2 dotprod. Upgrading your toolchain is strongly recommended.")
message(WARNING "The compiler does not support armv8.2 dotprod. NCNN_ARM82DOT will be OFF.")
endif()
else()
message(WARNING "The compiler does not support armv8.2. NCNN_ARM82 will be OFF.")
......
src/net.cpp
浏览文件 @ ad37c34d
......@@ -2396,7 +2396,7 @@ int Extractor::input(const char* blob_name, const Mat& in)
const std::vector<const char*>& input_names = d->net->input_names();
for (size_t i = 0; i < input_names.size(); i++)
{
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], i);
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], (int)i);
}
return -1;
......@@ -2414,7 +2414,7 @@ int Extractor::extract(const char* blob_name, Mat& feat, int type)
const std::vector<const char*>& output_names = d->net->output_names();
for (size_t i = 0; i < output_names.size(); i++)
{
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], i);
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], (int)i);
}
return -1;
......@@ -2605,7 +2605,7 @@ int Extractor::input(const char* blob_name, const VkMat& in)
const std::vector<const char*>& input_names = d->net->input_names();
for (size_t i = 0; i < input_names.size(); i++)
{
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], i);
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], (int)i);
}
return -1;
......@@ -2623,7 +2623,7 @@ int Extractor::extract(const char* blob_name, VkMat& feat, VkCompute& cmd)
const std::vector<const char*>& output_names = d->net->output_names();
for (size_t i = 0; i < output_names.size(); i++)
{
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], i);
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], (int)i);
}
return -1;
......@@ -2641,7 +2641,7 @@ int Extractor::input(const char* blob_name, const VkImageMat& in)
const std::vector<const char*>& input_names = d->net->input_names();
for (size_t i = 0; i < input_names.size(); i++)
{
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], i);
NCNN_LOGE(" ex.input(\"%s\", in%d);", input_names[i], (int)i);
}
return -1;
......@@ -2659,7 +2659,7 @@ int Extractor::extract(const char* blob_name, VkImageMat& feat, VkCompute& cmd)
const std::vector<const char*>& output_names = d->net->output_names();
for (size_t i = 0; i < output_names.size(); i++)
{
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], i);
NCNN_LOGE(" ex.extract(\"%s\", out%d);", output_names[i], (int)i);
}
return -1;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或