Skip to content

Commit

Permalink
Upgrade to Java 15, OpenJFX 15.0.1
Browse files Browse the repository at this point in the history
Upgrade to Tensorflow 2.3.1 Java API
Upgrade to other dependencies to newer versions
Migrate preference categories to tabs in Preferences dialog
Minor UI consistency fixes and cleanup
Update all documentation
  • Loading branch information
kinhong committed Dec 11, 2020
1 parent b2f96d4 commit 931b8cb
Show file tree
Hide file tree
Showing 99 changed files with 98,498 additions and 26,219 deletions.
6 changes: 6 additions & 0 deletions .idea/copyright/default.xml

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

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_codec_commons_codec_1_11.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_io_commons_io_2_6.xml

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_activation_activation_1_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

**OpenLabeler** is an open source application for annotating objects. It can generate the PASCAL VOC format XML annotation file for artificial intelligence and deep learning training. A unique aspect of this application is its ability to use inference (with [TensorFlow](https://www.tensorflow.org)) to help improve accuracy and speed up the annotation process.

OpenLabeler is written in [OpenJDK](https://openjdk.java.net)/[OpenJFX](https://openjfx.io) (version 11.x).
OpenLabeler is written in [OpenJDK](https://openjdk.java.net)/[OpenJFX](https://openjfx.io) (version 15.x).

![Application](assets/app.png)

Expand Down Expand Up @@ -36,20 +36,20 @@ OpenLabeler supports graphs with the `image_tensor` and `encoded_image_string_te

*Note: This is currently an experimental feature.*

OpenLabeler can be used to start/stop a training process in TensorFlow within a [Docker](https://www.docker.com) container. Containers with [TensorFlow](https://www.tensorflow.org/install/docker) and [Object Detection API](https://github.com/tensorflow/models/tree/master/research/object_detection) dependencies have been pre-built for your convenience. To use this feature:
OpenLabeler can be used to start/stop a training process in TensorFlow running inside a [Docker](https://www.docker.com) container. Containers with [TensorFlow 2](https://www.tensorflow.org/install/docker) and [Object Detection API](https://github.com/tensorflow/models/tree/master/research/object_detection) dependencies have been pre-built for your convenience. To use this feature:

1. [Install Docker](https://docs.docker.com/install) on your host machine
2. *Windows only* Open Docker > Settings > General and check "Expose daemon on tcp://localhost:2375 without TLS"
3. *Windows only* Create a `<home>\.docker-java.properties` file. Add a `DOCKER_HOST=tcp://localhost:2375 entry`. See [reference](https://github.com/docker-java/docker-java)
4. Choose a pre-built, `kinhong/openlabeler:latest-py3` or `kinhong/openlabeler:latest-gpu-py3`, [docker image](https://cloud.docker.com/repository/docker/kinhong/openlabeler/tags) from [Docker Hub](https://hub.docker.com/) and pull it to your docker host
5. Download a base model from the [TensorFlow Detection Model Zoo](https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/detection_model_zoo.md) for transfer learning
4. Choose a pre-built, `kinhong/openlabeler:tf-2.3.1` or `kinhong/openlabeler:tf-2.3.1-gpu`, [docker image](https://cloud.docker.com/repository/docker/kinhong/openlabeler/tags) from [Docker Hub](https://hub.docker.com/) and pull it to your docker host
5. Download a base model from the [TensorFlow 2 Detection Model Zoo](https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/tf2_detection_zoo.md) for transfer learning
6. Configure the Training Preference settings (and add the label map entries)
![Train Preferences](assets/pref-train.png)
7. You can then start, stop, continue, restart training, or export the inference graph

## Shortcut Keys

The following shortcut keys are supported:
OpenLabeler supports the following shortcut keys:

| Key Combination | Action
| ------------- | -------------
Expand Down Expand Up @@ -89,8 +89,9 @@ Download and execute the `.pkg`, `.deb` or `.msi` installation packages for macO
+models
+model
-pipeline config file
+train
-saved_model
+temp (created by OpenLabeler)
-ckpt-xyz...
+fine_tuned_model (created by OpenLabeler
```

## Build
Expand Down
Binary file removed app/bin/jdk.packager-linux/jdk.packager.jar
Binary file not shown.
Loading

0 comments on commit 931b8cb

Please sign in to comment.