Skip to content

Remove MODNET model #209

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.

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

Merged
merged 3 commits into from
Mar 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,20 @@ jobs:
if [[ '${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}' != '' && \
'${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}' != '' && \
'${{ secrets.MACOS_SIGNING_CERT }}' != '' ]] {
print 'haveCodesignIdent=true' >> $GITHUB_OUTPUT
echo 'haveCodesignIdent=true' >> "$GITHUB_OUTPUT"
echo "found signing information"
} else {
print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT
echo 'haveCodesignIdent=false' >> "$GITHUB_OUTPUT"
echo "signing information not found"
}

if [[ '${{ secrets.MACOS_NOTARIZATION_USERNAME }}' != '' && \
'${{ secrets.MACOS_NOTARIZATION_PASSWORD }}' != '' ]] {
print 'haveNotarizationUser=true' >> $GITHUB_OUTPUT
echo 'haveNotarizationUser=true' >> "$GITHUB_OUTPUT"
echo "found notarization user"
} else {
print 'haveNotarizationUser=false' >> $GITHUB_OUTPUT
echo 'haveNotarizationUser=false' >> "$GITHUB_OUTPUT"
echo "notarization user not found"
}
print '::endgroup::'

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ GPU support:

The pretrained model weights used for portrait foreground segmentation are taken from:
- https://github.com/anilsathyan7/Portrait-Segmentation/tree/master/SINet
- https://github.com/ZHKKKe/MODNet
- https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.7/contrib/PP-HumanSeg
- https://github.com/PINTO0309/PINTO_model_zoo/tree/main/082_MediaPipe_Meet_Segmentation
- https://github.com/PeterL1n/RobustVideoMatting
Expand Down
1 change: 0 additions & 1 deletion data/locale/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ GPUDirectML="GPU - DirectML"
CoreML="CoreML"
SegmentationModel="Segmentation model"
SINet="SINet"
MODNet="MODNet"
MediaPipe="MediaPipe"
SelfieSegmentation="Selfie Segmentation"
PPHumanSeg="PPHumanSeg"
Expand Down
1 change: 0 additions & 1 deletion data/locale/ja-JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ GPUDirectML="GPU - DirectML"
CoreML="CoreML"
SegmentationModel="セグメンテーションモデル"
SINet="SINet"
MODNet="MODNet"
MediaPipe="MediaPipe"
SelfieSegmentation="Selfie Segmentation"
PPHumanSeg="PPHumanSeg"
Expand Down
Binary file removed data/models/modnet_simple.onnx
Binary file not shown.
6 changes: 0 additions & 6 deletions src/background-filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@
#include <fstream>

#include "plugin-macros.generated.h"
#include "models/ModelMODNET.h"
#include "models/ModelSINET.h"
#include "models/ModelMediapipe.h"
#include "models/ModelSelfie.h"
#include "models/ModelRVM.h"
#include "models/ModelPPHumanSeg.h"

const char *MODEL_SINET = "models/SINet_Softmax_simple.onnx";
const char *MODEL_MODNET = "models/modnet_simple.onnx";
const char *MODEL_MEDIAPIPE = "models/mediapipe.onnx";
const char *MODEL_SELFIE = "models/selfie_segmentation.onnx";
const char *MODEL_RVM = "models/rvm_mobilenetv3_fp32.onnx";
Expand Down Expand Up @@ -130,7 +128,6 @@ static obs_properties_t *filter_properties(void *data)
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);

obs_property_list_add_string(p_model_select, obs_module_text("SINet"), MODEL_SINET);
obs_property_list_add_string(p_model_select, obs_module_text("MODNet"), MODEL_MODNET);
obs_property_list_add_string(p_model_select, obs_module_text("MediaPipe"), MODEL_MEDIAPIPE);
obs_property_list_add_string(p_model_select, obs_module_text("Selfie Segmentation"),
MODEL_SELFIE);
Expand Down Expand Up @@ -281,9 +278,6 @@ static void filter_update(void *data, obs_data_t *settings)
if (tf->modelSelection == MODEL_SINET) {
tf->model.reset(new ModelSINET);
}
if (tf->modelSelection == MODEL_MODNET) {
tf->model.reset(new ModelMODNET);
}
if (tf->modelSelection == MODEL_SELFIE) {
tf->model.reset(new ModelSelfie);
}
Expand Down
19 changes: 0 additions & 19 deletions src/models/ModelMODNET.h

This file was deleted.