Skip to content

[custom model] Add support for MODNet #569

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

Merged
merged 1 commit into from
Feb 6, 2024
Merged

[custom model] Add support for MODNet #569

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
29 changes: 22 additions & 7 deletions src/processors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,20 @@ function constraint_to_multiple_of(val, multiple, minVal = 0, maxVal = null) {
return x;
}

/**
* Rounds the height and width down to the closest multiple of size_divisibility
* @param {[number, number]} size The size of the image
* @param {number} divisor The divisor to use.
* @returns {[number, number]} The rounded size.
*/
function enforce_size_divisibility([width, height], divisor) {
return [
Math.floor(width / divisor) * divisor,
Math.floor(height / divisor) * divisor
];
}


/**
* Base class for feature extractors.
*
Expand Down Expand Up @@ -229,7 +243,7 @@ export class ImageFeatureExtractor extends FeatureExtractor {
* @param {boolean} config.do_normalize Whether to normalize the image pixel values.
* @param {boolean} config.do_resize Whether to resize the image.
* @param {number} config.resample What method to use for resampling.
* @param {number} config.size The size to resize the image to.
* @param {number|Object} config.size The size to resize the image to.
*/
constructor(config) {
super(config);
Expand Down Expand Up @@ -481,9 +495,12 @@ export class ImageFeatureExtractor extends FeatureExtractor {
: Math.min(longest_edge / newWidth, longest_edge / newHeight);

// To avoid certain floating point precision issues, we round to 2 decimal places
const finalWidth = Math.floor(Number((newWidth * longResizeFactor).toFixed(2)));
const finalHeight = Math.floor(Number((newHeight * longResizeFactor).toFixed(2)));
let finalWidth = Math.floor(Number((newWidth * longResizeFactor).toFixed(2)));
let finalHeight = Math.floor(Number((newHeight * longResizeFactor).toFixed(2)));

if (this.size_divisibility !== undefined) {
[finalWidth, finalHeight] = enforce_size_divisibility([finalWidth, finalHeight], this.size_divisibility)
}
return [finalWidth, finalHeight];

} else if (size !== undefined && size.width !== undefined && size.height !== undefined) {
Expand Down Expand Up @@ -515,10 +532,7 @@ export class ImageFeatureExtractor extends FeatureExtractor {
return [newWidth, newHeight];

} else if (this.size_divisibility !== undefined) {
// Rounds the height and width down to the closest multiple of size_divisibility
const newWidth = Math.floor(srcWidth / this.size_divisibility) * this.size_divisibility;
const newHeight = Math.floor(srcHeight / this.size_divisibility) * this.size_divisibility;
return [newWidth, newHeight];
return enforce_size_divisibility([srcWidth, srcHeight], this.size_divisibility);
} else {
throw new Error(`Could not resize image due to unsupported \`this.size\` option in config: ${JSON.stringify(size)}`);
}
Expand Down Expand Up @@ -2094,6 +2108,7 @@ export class OwlViTProcessor extends Processor { }
*/
export class AutoProcessor {
static FEATURE_EXTRACTOR_CLASS_MAPPING = {
ImageFeatureExtractor,
WhisperFeatureExtractor,
ViTFeatureExtractor,
MobileViTFeatureExtractor,
Expand Down