floratest1
/
SpireCV
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!37 fix bugs in x86-intel. 

Merge pull request !37 from Daniel/lxm
This commit is contained in:
jario-jin 2024-02-29 08:16:33 +00:00 committed by Gitee
parent f346ad49d9 29a2d9abf5
commit a1262883c5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
algorithm/landing_det/intel/landing_det_intel_impl.cpp
View File

@ -1,6 +1,7 @@
#include "landing_det_intel_impl.h" #include "landing_det_intel_impl.h"
#include <cmath> #include <cmath>
#include <fstream> #include <fstream>
#include "sv_util.h"
#define SV_MODEL_DIR "/SpireCV/models/" #define SV_MODEL_DIR "/SpireCV/models/"
#define SV_ROOT_DIR "/SpireCV/" #define SV_ROOT_DIR "/SpireCV/"
@ -27,7 +28,7 @@ namespace sv
#ifdef WITH_INTEL #ifdef WITH_INTEL
std::string onnx_model_fn = get_home() + SV_MODEL_DIR + "LandingMarker.onnx"; std::string onnx_model_fn = get_home() + SV_MODEL_DIR + "LandingMarker.onnx";
std::vector<std::string> files; std::vector<std::string> files;
_list_dir(get_home() + SV_MODEL_DIR, files, "-online.onnx", "Int-LandingMarker-resnet34"); list_dir(get_home() + SV_MODEL_DIR, files, "-online.onnx", "Int-LandingMarker-resnet34");
if (files.size() > 0) if (files.size() > 0)
{ {
std::sort(files.rbegin(), files.rend(), _comp_str_lesser); std::sort(files.rbegin(), files.rend(), _comp_str_lesser);

2
scripts/x86-intel/ffmpeg-install.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
sudo apt install -y v4l-utils sudo apt install -y v4l-utils build-essential yasm cmake libtool libc6 libc6-dev unzip wget libeigen3-dev libfmt-dev libnuma1 libnuma-dev libx264-dev libx265-dev libfaac-dev libssl-dev v4l-utils
wget https://ffmpeg.org/releases/ffmpeg-4.2.5.tar.bz2 wget https://ffmpeg.org/releases/ffmpeg-4.2.5.tar.bz2
tar -xjf ffmpeg-4.2.5.tar.bz2 tar -xjf ffmpeg-4.2.5.tar.bz2
cd ffmpeg-4.2.5 cd ffmpeg-4.2.5