Skip to content
Permalink
Browse files
Fix IC/DC annotation on Linux (#2715)
* Bump node-sass version for compat with Node 12.x

* Fix IC annotation on Linux
  • Loading branch information
Zach Nation committed Nov 22, 2019
1 parent 8216483 commit e7ed04f
Show file tree
Hide file tree
Showing 20 changed files with 67 additions and 62 deletions.
@@ -1,3 +1,4 @@
# Treat these paths as external for the purposes of GitHub's Linguist
deps/* linguist-vendored
src/external/* linguist-vendored
src/visualization/client/Turi[[:space:]]Create[[:space:]]Visualization/src/user_interface/build/* linguist-generated
@@ -119,10 +119,6 @@ def annotate(data, image_column=None, annotation_column='annotations'):
[image_column],
annotation_column
)
if __platform == "linux" or __platform == "linux2":
model = _image_feature_extractor._create_feature_extractor("squeezenet_v1.1")
feature_sframe = model.extract_features(data, image_column, verbose=False, batch_size=64)
annotation_window.add_image_features(feature_sframe)

with _QuietProgress(False):
annotation_window.annotate(_get_client_app_path())
@@ -284,8 +284,11 @@ void ImageClassification::_addAnnotationToSFrame(size_t index,
std::string label) {
/* Assert that the column type is indeed of type flex_enum::STRING */
size_t annotation_column_index = m_data->column_index(m_annotation_column);
DASSERT_EQ(m_data->dtype().at(annotation_column_index),
flex_type_enum::STRING);
flex_type_enum annotation_column_type = m_data->dtype().at(annotation_column_index);
if (m_data->select_column(annotation_column_index)->any()) {
DASSERT_EQ(annotation_column_type,
flex_type_enum::STRING);
}

std::shared_ptr<unity_sarray> data_sarray =
std::static_pointer_cast<unity_sarray>(

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -9,7 +9,7 @@
"@fortawesome/react-fontawesome": "0.0.18",
"d3": "^5.0.0",
"element-resize-event": "^2.0.9",
"node-sass": "4.11.0",
"node-sass": "^4.13.0",
"protobufjs": "^6.8.8",
"react": "^16.2.0",
"react-dom": "^16.2.0",
@@ -222,6 +222,10 @@ window.handleInput = function(data){
input_data["data"] = json_obj["accordion_spec"];
window.setAccordionData(input_data);
}

else if(json_obj["protobuf"] != null) {
window.setProtoMessage(json_obj["protobuf"]);
}

else {
throw new Error("Unexpected input to visualization client: " + JSON.stringify(data));

0 comments on commit e7ed04f

Please sign in to comment.