From bf16091c29f3ba94a96e536a3872f1c87e023ddb Mon Sep 17 00:00:00 2001 From: Octogonapus Date: Tue, 12 May 2020 16:36:56 -0400 Subject: [PATCH] Rebrand as INNDiE (#166) * Rename util module * Rename ui-javafx module * Rename training-test-util module * Rename training module * Rename tf-layer-loader module * Rename tf-data-code module * Rename tf-data module * Rename test-util module * Rename test-runner module * Rename plugin module * Rename pattern-match module * Rename logging module * Rename example-models module * Rename dsl-test-util module * Rename db-test-util module * Rename db module * Rename aws module * Rename gradle projcet * Axon -> INNDiE * axon -> inndie * Fix S3PreferencesManager letting an exception get loose * Update Azure build ID * Poke azure Co-authored-by: Austin Shalit --- README.md | 52 +++---- .../wpi/{axon => inndie}/aws/EC2Manager.kt | 8 +- .../aws/EC2TrainingResultSupplier.kt | 5 +- .../aws/EC2TrainingScriptCanceller.kt | 2 +- .../aws/EC2TrainingScriptProgressReporter.kt | 19 +-- .../aws/EC2TrainingScriptRunner.kt | 42 +++--- .../{axon => inndie}/aws/LoadPreferences.kt | 10 +- .../aws/LocalTrainingResultSupplier.kt | 2 +- .../aws/LocalTrainingScriptCanceller.kt | 6 +- .../LocalTrainingScriptProgressReporter.kt | 23 ++-- .../aws/LocalTrainingScriptRunner.kt | 24 ++-- .../aws/RunTrainingScriptConfiguration.kt | 6 +- .../edu/wpi/{axon => inndie}/aws/S3Manager.kt | 42 +++--- .../aws/S3PreferencesManager.kt | 19 ++- .../aws/TrainingResultSupplier.kt | 2 +- .../aws/TrainingScriptCanceller.kt | 2 +- .../aws/TrainingScriptProgressReporter.kt | 4 +- .../aws/TrainingScriptRunner.kt | 2 +- .../aws/plugin/S3PluginManager.kt | 15 +- .../preferences/LocalPreferencesManager.kt | 2 +- .../aws/preferences/Preferences.kt | 2 +- .../aws/preferences/PreferencesManager.kt | 2 +- .../EC2TrainingScriptProgressReporterTest.kt | 4 +- .../aws/EC2TrainingScriptRunnerTest.kt | 8 +- ...LocalTrainingScriptProgressReporterTest.kt | 10 +- .../aws/LocalTrainingScriptRunnerIntegTest.kt | 16 ++- .../aws/LocalTrainingScriptRunnerTest.kt | 6 +- .../edu/wpi/{axon => inndie}/aws/TestUtil.kt | 6 +- .../aws/plugin/S3PluginManagerTest.kt | 32 ++++- .../LocalPreferencesManagerTest.kt | 2 +- .../aws/custom_fashion_mnist.h5 | Bin .../wpi/{axon => inndie}/db/data/TestUtil.kt | 40 +++--- .../edu/wpi/{axon => inndie}/db/JobDb.kt | 30 ++-- .../db/data/DesiredJobTrainingMethod.kt | 2 +- .../db/data/InternalJobTrainingMethod.kt | 4 +- .../edu/wpi/{axon => inndie}/db/data/Job.kt | 16 +-- .../{axon => inndie}/db/data/ModelSource.kt | 6 +- .../db/data/TrainingScriptProgress.kt | 2 +- .../edu/wpi/{axon => inndie}/db/JobDbTest.kt | 6 +- .../db/data/TrainingScriptProgressTest.kt | 6 +- .../edu/wpi/{axon => inndie}/dsl/Code.kt | 6 +- .../wpi/{axon => inndie}/dsl/Configurable.kt | 2 +- .../dsl/UniqueVariableNameGenerator.kt | 2 +- .../PolymorphicNamedDomainObjectContainer.kt | 2 +- .../{axon => inndie}/dsl/imports/Import.kt | 33 ++++- .../dsl/imports/ImportValidator.kt | 2 +- .../edu/wpi/{axon => inndie}/dsl/task/Task.kt | 11 +- .../dsl/validator/path/PathValidator.kt | 2 +- .../variablename/VariableNameValidator.kt | 2 +- .../{axon => inndie}/dsl/variable/Variable.kt | 6 +- .../wpi/{axon => inndie}/dsl/ImportTest.kt | 6 +- .../edu/wpi/{axon => inndie}/dsl/MockTask.kt | 8 +- .../edu/wpi/{axon => inndie}/dsl/MockUtil.kt | 8 +- .../wpi/{axon => inndie}/dsl/MockVariable.kt | 4 +- .../dsl/TaskConfigurationTestFixture.kt | 8 +- .../edu/wpi/{axon => inndie}/dsl/TestUtil.kt | 6 +- .../wpi/{axon => inndie}/dsl/MockUtilTest.kt | 4 +- .../wpi/{axon => inndie}/dsl/TestUtilTest.kt | 2 +- .../edu/wpi/axon/dsl/BackendKoinModules.kt | 28 ---- .../edu/wpi/inndie/dsl/BackendKoinModules.kt | 28 ++++ .../edu/wpi/{axon => inndie}/dsl/CodeGraph.kt | 10 +- .../dsl/DefaultUniqueVariableNameGenerator.kt | 5 +- ...lymorphicNamedDomainObjectContainerUtil.kt | 10 +- .../{axon => inndie}/dsl/ScriptGenerator.kt | 16 +-- ...ltPolymorphicNamedDomainObjectContainer.kt | 2 +- .../dsl/container/DslDelegate.kt | 2 +- ...edDomainObjectContainerDelegateProvider.kt | 4 +- .../dsl/imports/DefaultImportValidator.kt | 2 +- .../dsl/task/ApplyFunctionalLayerDeltaTask.kt | 22 +-- .../dsl/task/ApplySequentialLayerDeltaTask.kt | 18 +-- .../wpi/{axon => inndie}/dsl/task/BaseTask.kt | 4 +- .../dsl/task/CSVLoggerCallbackTask.kt | 16 +-- .../dsl/task/CheckpointCallbackTask.kt | 18 +-- .../dsl/task/CompileModelTask.kt | 22 +-- .../task/ConvertSuperviselyDatasetToRecord.kt | 16 +-- .../dsl/task/EarlyStoppingTask.kt | 14 +- .../dsl/task/EmptyBaseTask.kt | 8 +- .../dsl/task/EnableEagerExecutionTask.kt | 10 +- .../dsl/task/LayerDeltaUtil.kt | 8 +- .../dsl/task/LayerOperation.kt | 4 +- .../dsl/task/LoadClassLabels.kt | 12 +- .../dsl/task/LoadExampleDatasetTask.kt | 18 +-- .../dsl/task/LoadImageTask.kt | 12 +- .../dsl/task/LoadModelTask.kt | 12 +- .../dsl/task/LoadStringTask.kt | 10 +- .../task/LoadTFRecordOfImagesWithObjects.kt | 16 +-- .../dsl/task/PostTrainingQuantizationTask.kt | 16 +-- .../dsl/task/RunEdgeTpuCompilerTask.kt | 16 +-- .../dsl/task/RunInferenceTask.kt | 10 +- .../dsl/task/RunPluginTask.kt | 10 +- .../task/S3ProgressReportingCallbackTask.kt | 22 +-- .../dsl/task/SaveModelTask.kt | 12 +- .../{axon => inndie}/dsl/task/SliceTask.kt | 10 +- .../{axon => inndie}/dsl/task/TrainTask.kt | 14 +- .../validator/path/DefaultPathValidator.kt | 2 +- .../PythonVariableNameValidator.kt | 2 +- .../wpi/{axon => inndie}/dsl/CodeGraphTest.kt | 2 +- .../DefaultUniqueVariableNameGeneratorTest.kt | 2 +- .../wpi/{axon => inndie}/dsl/MockContainer.kt | 4 +- .../dsl/ScriptGeneratorIntegrationTest.kt | 12 +- .../dsl/ScriptGeneratorTest.kt | 10 +- ...lymorphicNamedDomainObjectContainerTest.kt | 24 ++-- .../dsl/imports/DefaultImportValidatorTest.kt | 2 +- ...lyFunctionalLayerDeltaConfigurationTest.kt | 4 +- .../task/ApplyFunctionalLayerDeltaTaskTest.kt | 20 +-- ...lySequentialLayerDeltaConfigurationTest.kt | 4 +- ...SequentialLayerDeltaTaskIntegrationTest.kt | 12 +- .../task/ApplySequentialLayerDeltaTaskTest.kt | 16 +-- .../{axon => inndie}/dsl/task/BaseTaskTest.kt | 16 +-- .../CSVLoggerCallbackTaskConfigurationTest.kt | 4 +- .../dsl/task/CSVLoggerCallbackTaskTest.kt | 8 +- ...CheckpointCallbackTaskConfigurationTest.kt | 4 +- .../dsl/task/CheckpointCallbackTaskTest.kt | 8 +- .../dsl/task/CompileModelConfigurationTest.kt | 4 +- .../task/CompileModelTaskIntegrationTest.kt | 12 +- .../dsl/task/CompileModelTaskTest.kt | 14 +- .../EarlyStoppingTaskConfigurationTest.kt | 4 +- .../dsl/task/EarlyStoppingTaskTest.kt | 6 +- .../dsl/task/EnableEagerExecutionTaskTest.kt | 4 +- .../task/LoadClassLabelsConfigurationTest.kt | 4 +- .../dsl/task/LoadClassLabelsTest.kt | 12 +- ...LoadExampleDatasetTaskConfigurationTest.kt | 4 +- .../dsl/task/LoadExampleDatasetTaskTest.kt | 12 +- .../task/LoadImageTaskConfigurationTest.kt | 4 +- .../dsl/task/LoadImageTaskTest.kt | 12 +- .../task/LoadModelTaskConfigurationTest.kt | 4 +- .../dsl/task/LoadModelTaskTest.kt | 8 +- .../task/LoadStringTaskConfigurationTest.kt | 4 +- .../dsl/task/LoadStringTaskTest.kt | 6 +- ...ordOfImagesWithObjectsConfigurationTest.kt | 8 +- ...ainingQuantizationTaskConfigurationTest.kt | 4 +- .../task/PostTrainingQuantizationTaskTest.kt | 12 +- ...RunEdgeTpuCompilerTaskConfigurationTest.kt | 4 +- .../dsl/task/RunEdgeTpuCompilerTaskTest.kt | 10 +- .../task/RunInferenceTaskConfigurationTest.kt | 4 +- .../dsl/task/RunInferenceTaskTest.kt | 6 +- .../dsl/task/RunPluginTaskTest.kt | 10 +- .../S3ProgressReportingCallbackTaskTest.kt | 16 +-- .../dsl/task/SaveModelTaskTest.kt | 8 +- .../dsl/task/SliceTaskConfigurationTest.kt | 4 +- .../dsl/task/SliceTaskTest.kt | 6 +- .../dsl/task/TrainTaskTest.kt | 12 +- .../path/DefaultPathValidatorTest.kt | 2 +- .../PythonVariableNameValidatorTest.kt | 2 +- .../examplemodel/ExampleModel.kt | 6 +- .../examplemodel/ExampleModelManager.kt | 8 +- .../examplemodel/ExampleModelsMetadata.kt | 2 +- .../examplemodel/GitExampleModelManager.kt | 10 +- .../GitExampleModelManagerTest.kt | 10 +- gradle.properties | 2 +- axon.gradle.kts => inndie.gradle.kts | 27 +--- .../wpi/inndie/logging/logging.kt} | 2 + logging/src/main/resources/log4j.properties | 2 +- .../patternmatch/MatchedPremise.kt | 2 +- .../{axon => inndie}/patternmatch/Pattern.kt | 2 +- .../patternmatch/PatternMatch.kt | 2 +- .../patternmatch/ReturnValue.kt | 2 +- .../wpi/axon/patternmatch/PatternMatchTest.kt | 35 ----- .../inndie/patternmatch/PatternMatchTest.kt | 62 +++++++++ .../patternmatch/PatternTest.kt | 62 +++++++-- .../{axon => inndie}/plugin/DatasetPlugins.kt | 11 +- .../plugin/LoadTestDataPlugins.kt | 2 +- .../plugin/LocalPluginManager.kt | 13 +- .../edu/wpi/{axon => inndie}/plugin/Plugin.kt | 6 +- .../{axon => inndie}/plugin/PluginCache.kt | 2 +- .../{axon => inndie}/plugin/PluginManager.kt | 2 +- .../plugin/ProcessTestOutputPlugins.kt | 11 +- .../plugin/LocalPluginManagerTest.kt | 41 ++++-- settings.gradle.kts | 2 +- .../testrunner/LocalTestRunner.kt | 28 ++-- .../{axon => inndie}/testrunner/TestData.kt | 4 +- .../{axon => inndie}/testrunner/TestRunner.kt | 4 +- .../testrunner/LocalTestRunnerIntegTest.kt | 8 +- .../32_32_1_conv_sequential-trained.h5 | Bin .../testutil/KoinTestFixture.kt | 2 +- test-util/test-util.gradle.kts | 2 +- .../code/DefaultExampleDatasetToCode.kt | 4 +- .../tfdata/code/ExampleDatasetToCode.kt | 4 +- .../tfdata/code/PythonUtil.kt | 6 +- .../tfdata/code/layer/ConstraintToCode.kt | 4 +- .../code/layer/DefaultConstraintToCode.kt | 6 +- .../code/layer/DefaultInitializerToCode.kt | 6 +- .../tfdata/code/layer/DefaultLayerToCode.kt | 14 +- .../code/layer/DefaultRegularizerToCode.kt | 4 +- .../tfdata/code/layer/InitializerToCode.kt | 4 +- .../tfdata/code/layer/LayerToCode.kt | 6 +- .../tfdata/code/layer/RegularizerToCode.kt | 4 +- .../tfdata/code/loss/DefaultLossToCode.kt | 4 +- .../tfdata/code/loss/LossToCode.kt | 4 +- .../code/optimizer/DefaultOptimizerToCode.kt | 6 +- .../tfdata/code/optimizer/OptimizerToCode.kt | 4 +- .../code/DefaultExampleDatasetToCodeTest.kt | 4 +- .../code/layer/DefaultConstraintToCodeTest.kt | 4 +- .../layer/DefaultInitializerToCodeTest.kt | 9 +- .../code/layer/DefaultLayerToCodeTest.kt | 40 +++--- .../layer/DefaultRegularizerToCodeTest.kt | 4 +- .../tfdata/code/loss/DefaultLossToCodeTest.kt | 4 +- .../optimizer/DefaultOptimizerToCodeTest.kt | 4 +- .../wpi/{axon => inndie}/tfdata/Dataset.kt | 4 +- .../edu/wpi/{axon => inndie}/tfdata/Model.kt | 4 +- .../tfdata/ModelCheckpointSaveFrequency.kt | 2 +- .../{axon => inndie}/tfdata/SerializerUtil.kt | 30 ++-- .../wpi/{axon => inndie}/tfdata/Verbosity.kt | 2 +- .../tfdata/layer/Activation.kt | 4 +- .../tfdata/layer/Constraint.kt | 2 +- .../tfdata/layer/DataFormat.kt | 2 +- .../tfdata/layer/Initializer.kt | 4 +- .../tfdata/layer/Interpolation.kt | 2 +- .../{axon => inndie}/tfdata/layer/Layer.kt | 56 ++++++-- .../tfdata/layer/PoolingPadding.kt | 2 +- .../tfdata/layer/Regularizer.kt | 10 +- .../wpi/{axon => inndie}/tfdata/loss/Loss.kt | 2 +- .../tfdata/optimizer/Optimizer.kt | 2 +- .../edu/wpi/axon/tfdata/layer/LayerTest.kt | 30 ---- .../{axon => inndie}/tfdata/DatasetTest.kt | 4 +- .../ModelCheckpointSaveFrequencyTest.kt | 2 +- .../wpi/{axon => inndie}/tfdata/ModelTest.kt | 23 +++- .../{axon => inndie}/tfdata/VerbosityTest.kt | 2 +- .../edu/wpi/inndie/tfdata/layer/LayerTest.kt | 66 +++++++++ .../{axon => inndie}/tfdata/loss/LossTest.kt | 2 +- .../tfdata/optimizer/OptimizerTest.kt | 5 +- .../tflayerloader/DefaultLayersToGraph.kt | 8 +- .../tflayerloader/HDF5ModelLoader.kt | 35 +++-- .../tflayerloader/LayerGraphUtil.kt | 8 +- .../tflayerloader/LayersToGraph.kt | 6 +- .../tflayerloader/ModelLoader.kt | 4 +- .../tflayerloader/ModelLoaderFactory.kt | 2 +- .../tflayerloader/DefaultLayersToGraphTest.kt | 7 +- .../HDF5ModelLoaderIntegrationTest.kt | 24 ++-- ...oadLayersWithConstraintsIntegrationTest.kt | 10 +- ...adLayersWithInitializersIntegrationTest.kt | 27 ++-- ...adLayersWithRegularizersIntegrationTest.kt | 10 +- .../LoadSpecificLayerTypesIntegrationTest.kt | 32 +++-- .../tflayerloader/ModelLoaderFactoryTest.kt | 2 +- .../tflayerloader/ModelTestUtil.kt | 4 +- .../tflayerloader/badModel1.h5 | Bin .../tflayerloader/mobilenetv2_1.00_224.h5 | Bin .../tflayerloader/mobilenetv2_tf-1-15.h5 | Bin .../{axon => inndie}/tflayerloader/model1.h5 | Bin .../tflayerloader/nonSequentialModel1.h5 | Bin .../{axon => inndie}/tflayerloader/rnn1.h5 | Bin .../sequential_with_avgpool2d.h5 | Bin ...equential_with_constant_int_initializer.h5 | Bin ...quential_with_constant_list_initializer.h5 | Bin ...ntial_with_constant_nparray_initializer.h5 | Bin ...uential_with_constant_tuple_initializer.h5 | Bin .../sequential_with_globalmaxpooling2d.h5 | Bin ...equential_with_glorotnormal_initializer.h5 | Bin ...quential_with_glorotuniform_initializer.h5 | Bin .../sequential_with_identity_initializer.h5 | Bin .../sequential_with_l1_regularizer.h5 | Bin .../sequential_with_maxnorm_constraint.h5 | Bin .../sequential_with_minmaxnorm_constraint.h5 | Bin .../sequential_with_nonneg_constraint.h5 | Bin .../sequential_with_orthogonal_initializer.h5 | Bin ...equential_with_randomnormal_initializer.h5 | Bin ...quential_with_randomuniform_initializer.h5 | Bin ...l_with_randomuniform_tensor_initializer.h5 | Bin .../sequential_with_spatialdropout2d.h5 | Bin ...ential_with_truncatednormal_initializer.h5 | Bin .../sequential_with_unitnorm_constraint.h5 | Bin .../sequential_with_upsampling2d_bilinear.h5 | Bin .../sequential_with_upsampling2d_nearest.h5 | Bin ...ling_fanavg_truncatednormal_initializer.h5 | Bin ...ng_fanavg_untruncatednormal_initializer.h5 | Bin ...riancescaling_fanin_uniform_initializer.h5 | Bin ...riancescaling_fanout_normal_initializer.h5 | Bin .../training/testutil/TrainTestUtil.kt | 8 +- .../training/LoadedDataset.kt | 4 +- .../training/ModelDeploymentTarget.kt | 2 +- .../TrainGeneralModelScriptGenerator.kt | 20 +-- .../training/TrainModelScriptGenerator.kt | 4 +- .../TrainSequentialModelScriptGenerator.kt | 20 +-- .../{axon => inndie}/training/TrainState.kt | 30 ++-- .../{axon => inndie}/training/TrainUtil.kt | 54 ++++---- .../training/Conv32321IntegrationTest.kt | 34 +++-- .../Mobilenet-v-1-14-IntegrationTest.kt | 20 +-- .../Mobilenet-v-1-15-IntegrationTest.kt | 16 +-- ...eralModelScriptGeneratorIntegrationTest.kt | 20 +-- .../training/TrainIntegrationTest.kt | 28 ++-- ...tialModelScriptGeneratorIntegrationTest.kt | 59 +++++--- .../training/TrainStateTest.kt | 14 +- .../training/32_32_1_conv_general.h5 | Bin .../training/32_32_1_conv_sequential.h5 | Bin .../training/WPILib_reduced.tar | Bin .../{axon => inndie}/training/badModel1.h5 | Bin .../training/custom_fashion_mnist.h5 | Bin .../training/mobilenet_tf_1_15_0.h5 | Bin .../training/mobilenetv2_1.00_224.h5 | Bin .../training/mobilenetv2_tf-1-15.h5 | Bin .../training/network_with_add.h5 | Bin .../small_model_for_wpilib_reduced_dataset.h5 | Bin .../ui/JobLifecycleManager.kt | 16 ++- .../edu/wpi/{axon => inndie}/ui/JobRunner.kt | 130 ++++++++++-------- .../wpi/{axon => inndie}/ui/ModelManager.kt | 18 +-- .../ui/controller/JobBoard.kt | 12 +- .../ui/controller/PluginStore.kt | 12 +- .../ui/controller/WizardTaskService.kt | 18 +-- .../ui/main/FrontendKoinModules.kt | 71 +++++----- .../main/Axon.kt => inndie/ui/main/INNDiE.kt} | 10 +- .../{axon => inndie}/ui/model/AdamModel.kt | 4 +- .../{axon => inndie}/ui/model/CoralModel.kt | 4 +- .../wpi/{axon => inndie}/ui/model/Dataset.kt | 4 +- .../{axon => inndie}/ui/model/FTRLModel.kt | 4 +- .../edu/wpi/{axon => inndie}/ui/model/Job.kt | 43 +++--- .../ui/model/ModelSourceType.kt | 2 +- .../{axon => inndie}/ui/model/PluginModel.kt | 6 +- .../ui/model/PreferencesModel.kt | 6 +- .../{axon => inndie}/ui/model/RMSpropModel.kt | 4 +- .../{axon => inndie}/ui/model/WizardTask.kt | 10 +- .../edu/wpi/{axon => inndie}/ui/view/About.kt | 4 +- .../{axon => inndie}/ui/view/ContentMap.kt | 2 +- .../{axon => inndie}/ui/view/JobManager.kt | 8 +- .../edu/wpi/{axon => inndie}/ui/view/Main.kt | 6 +- .../{axon => inndie}/ui/view/TornadoUtil.kt | 2 +- .../ui/view/jobeditor/DatasetPicker.kt | 14 +- .../ui/view/jobeditor/JobConfiguration.kt | 16 +-- .../ui/view/jobeditor/JobEditor.kt | 14 +- .../ui/view/jobeditor/LossFragment.kt | 6 +- .../ui/view/jobeditor/ModelPicker.kt | 20 +-- .../ui/view/jobeditor/OptimizerFragment.kt | 24 ++-- .../ui/view/jobeditor/TargetFragment.kt | 12 +- .../ui/view/joblist/JobList.kt | 34 ++--- .../ui/view/joblist/JobListFragment.kt | 8 +- .../ui/view/joblist/JobWizard.kt | 18 +-- .../ui/view/jobresult/JobResultsView.kt | 8 +- .../ui/view/jobresult/LazyResult.kt | 2 +- .../ui/view/jobresult/ResultFragment.kt | 2 +- .../ui/view/jobtestview/JobTestView.kt | 36 ++--- .../ui/view/jobtestview/JobTestViewModel.kt | 6 +- .../ui/view/jobtestview/TestDataType.kt | 2 +- .../ui/view/jobtestview/TestResultFragment.kt | 6 +- .../ui/view/layereditor/LayerCell.kt | 4 +- .../ui/view/layereditor/LayerEditor.kt | 8 +- .../view/layereditor/LayerEditorFragment.kt | 4 +- .../view/layereditor/TrainableLayerModel.kt | 4 +- .../view/layereditor/UntrainableLayerModel.kt | 4 +- .../ui/view/preferences/PluginEditor.kt | 4 +- .../view/preferences/PluginManagerEditor.kt | 8 +- .../ui/view/preferences/PreferencesView.kt | 14 +- ui-javafx/ui-javafx.gradle.kts | 4 +- .../kotlin/edu/wpi/axon/util/KoinNames.kt | 6 - .../edu/wpi/{axon => inndie}/util/FilePath.kt | 4 +- .../wpi/{axon => inndie}/util/GraphUtil.kt | 4 +- ...nitializedPropertyModificationException.kt | 2 +- .../kotlin/edu/wpi/inndie/util/KoinNames.kt | 6 + .../wpi/{axon => inndie}/util/SingleAssign.kt | 11 +- .../edu/wpi/{axon => inndie}/util/Util.kt | 6 +- 348 files changed, 1895 insertions(+), 1555 deletions(-) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/EC2Manager.kt (91%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingResultSupplier.kt (83%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingScriptCanceller.kt (96%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingScriptProgressReporter.kt (93%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingScriptRunner.kt (78%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/LoadPreferences.kt (72%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingResultSupplier.kt (96%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptCanceller.kt (88%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptProgressReporter.kt (91%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptRunner.kt (92%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/RunTrainingScriptConfiguration.kt (86%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/S3Manager.kt (86%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/S3PreferencesManager.kt (70%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/TrainingResultSupplier.kt (94%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/TrainingScriptCanceller.kt (92%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/TrainingScriptProgressReporter.kt (90%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/TrainingScriptRunner.kt (91%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/plugin/S3PluginManager.kt (81%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/preferences/LocalPreferencesManager.kt (97%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/preferences/Preferences.kt (95%) rename aws/src/main/kotlin/edu/wpi/{axon => inndie}/aws/preferences/PreferencesManager.kt (93%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingScriptProgressReporterTest.kt (98%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/EC2TrainingScriptRunnerTest.kt (97%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptProgressReporterTest.kt (93%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptRunnerIntegTest.kt (96%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/LocalTrainingScriptRunnerTest.kt (94%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/TestUtil.kt (82%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/plugin/S3PluginManagerTest.kt (84%) rename aws/src/test/kotlin/edu/wpi/{axon => inndie}/aws/preferences/LocalPreferencesManagerTest.kt (95%) rename aws/src/test/resources/edu/wpi/{axon => inndie}/aws/custom_fashion_mnist.h5 (100%) rename db-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/TestUtil.kt (84%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/JobDb.kt (93%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/DesiredJobTrainingMethod.kt (79%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/InternalJobTrainingMethod.kt (94%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/Job.kt (79%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/ModelSource.kt (88%) rename db/src/main/kotlin/edu/wpi/{axon => inndie}/db/data/TrainingScriptProgress.kt (98%) rename db/src/test/kotlin/edu/wpi/{axon => inndie}/db/JobDbTest.kt (96%) rename db/src/test/kotlin/edu/wpi/{axon => inndie}/db/data/TrainingScriptProgressTest.kt (87%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/Code.kt (88%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/Configurable.kt (88%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/UniqueVariableNameGenerator.kt (88%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/container/PolymorphicNamedDomainObjectContainer.kt (95%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/imports/Import.kt (71%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/imports/ImportValidator.kt (92%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/Task.kt (80%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/validator/path/PathValidator.kt (85%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/validator/variablename/VariableNameValidator.kt (84%) rename dsl-interface/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/variable/Variable.kt (81%) rename dsl-interface/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/ImportTest.kt (90%) rename dsl-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/MockTask.kt (82%) rename dsl-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/MockUtil.kt (84%) rename dsl-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/MockVariable.kt (59%) rename dsl-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/TaskConfigurationTestFixture.kt (94%) rename dsl-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/TestUtil.kt (87%) rename dsl-test-util/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/MockUtilTest.kt (96%) rename dsl-test-util/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/TestUtilTest.kt (97%) delete mode 100644 dsl/src/main/kotlin/edu/wpi/axon/dsl/BackendKoinModules.kt create mode 100644 dsl/src/main/kotlin/edu/wpi/inndie/dsl/BackendKoinModules.kt rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/CodeGraph.kt (94%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/DefaultUniqueVariableNameGenerator.kt (65%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/PolymorphicNamedDomainObjectContainerUtil.kt (86%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/ScriptGenerator.kt (96%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt (97%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/container/DslDelegate.kt (91%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt (94%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/imports/DefaultImportValidator.kt (94%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplyFunctionalLayerDeltaTask.kt (94%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplySequentialLayerDeltaTask.kt (88%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/BaseTask.kt (87%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/CSVLoggerCallbackTask.kt (80%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/CheckpointCallbackTask.kt (87%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/CompileModelTask.kt (73%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/ConvertSuperviselyDatasetToRecord.kt (93%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/EarlyStoppingTask.kt (87%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/EmptyBaseTask.kt (70%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/EnableEagerExecutionTask.kt (70%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LayerDeltaUtil.kt (92%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LayerOperation.kt (84%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadClassLabels.kt (82%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadExampleDatasetTask.kt (80%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadImageTask.kt (80%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadModelTask.kt (80%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadStringTask.kt (77%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadTFRecordOfImagesWithObjects.kt (93%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/PostTrainingQuantizationTask.kt (88%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunEdgeTpuCompilerTask.kt (85%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunInferenceTask.kt (83%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunPluginTask.kt (90%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/S3ProgressReportingCallbackTask.kt (76%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/SaveModelTask.kt (82%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/SliceTask.kt (77%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/task/TrainTask.kt (92%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/validator/path/DefaultPathValidator.kt (92%) rename dsl/src/main/kotlin/edu/wpi/{axon => inndie}/dsl/validator/variablename/PythonVariableNameValidator.kt (81%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/CodeGraphTest.kt (99%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/DefaultUniqueVariableNameGeneratorTest.kt (97%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/MockContainer.kt (87%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/ScriptGeneratorIntegrationTest.kt (96%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/ScriptGeneratorTest.kt (87%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt (89%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/imports/DefaultImportValidatorTest.kt (96%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt (77%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt (98%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt (77%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt (97%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/ApplySequentialLayerDeltaTaskTest.kt (96%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/BaseTaskTest.kt (85%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt (69%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CSVLoggerCallbackTaskTest.kt (88%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CheckpointCallbackTaskConfigurationTest.kt (74%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CheckpointCallbackTaskTest.kt (88%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CompileModelConfigurationTest.kt (67%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CompileModelTaskIntegrationTest.kt (78%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/CompileModelTaskTest.kt (89%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/EarlyStoppingTaskConfigurationTest.kt (66%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/EarlyStoppingTaskTest.kt (87%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/EnableEagerExecutionTaskTest.kt (79%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadClassLabelsConfigurationTest.kt (71%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadClassLabelsTest.kt (80%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt (81%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadExampleDatasetTaskTest.kt (84%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadImageTaskConfigurationTest.kt (69%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadImageTaskTest.kt (79%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadModelTaskConfigurationTest.kt (69%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadModelTaskTest.kt (77%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadStringTaskConfigurationTest.kt (71%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadStringTaskTest.kt (84%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt (73%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt (82%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/PostTrainingQuantizationTaskTest.kt (90%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt (75%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunEdgeTpuCompilerTaskTest.kt (90%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunInferenceTaskConfigurationTest.kt (77%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunInferenceTaskTest.kt (82%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/RunPluginTaskTest.kt (92%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/S3ProgressReportingCallbackTaskTest.kt (78%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/SaveModelTaskTest.kt (83%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/SliceTaskConfigurationTest.kt (71%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/SliceTaskTest.kt (78%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/task/TrainTaskTest.kt (95%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/validator/path/DefaultPathValidatorTest.kt (96%) rename dsl/src/test/kotlin/edu/wpi/{axon => inndie}/dsl/validator/variablename/PythonVariableNameValidatorTest.kt (96%) rename example-models/src/main/kotlin/edu/wpi/{axon => inndie}/examplemodel/ExampleModel.kt (80%) rename example-models/src/main/kotlin/edu/wpi/{axon => inndie}/examplemodel/ExampleModelManager.kt (93%) rename example-models/src/main/kotlin/edu/wpi/{axon => inndie}/examplemodel/ExampleModelsMetadata.kt (94%) rename example-models/src/main/kotlin/edu/wpi/{axon => inndie}/examplemodel/GitExampleModelManager.kt (87%) rename example-models/src/test/kotlin/edu/wpi/{axon => inndie}/examplemodel/GitExampleModelManagerTest.kt (97%) rename axon.gradle.kts => inndie.gradle.kts (93%) rename logging/src/main/kotlin/{edu.wpi.axon.logging.kt => edu/wpi/inndie/logging/logging.kt} (91%) rename pattern-match/src/main/kotlin/edu/wpi/{axon => inndie}/patternmatch/MatchedPremise.kt (94%) rename pattern-match/src/main/kotlin/edu/wpi/{axon => inndie}/patternmatch/Pattern.kt (96%) rename pattern-match/src/main/kotlin/edu/wpi/{axon => inndie}/patternmatch/PatternMatch.kt (97%) rename pattern-match/src/main/kotlin/edu/wpi/{axon => inndie}/patternmatch/ReturnValue.kt (63%) delete mode 100644 pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt create mode 100644 pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternMatchTest.kt rename pattern-match/src/test/kotlin/edu/wpi/{axon => inndie}/patternmatch/PatternTest.kt (58%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/DatasetPlugins.kt (87%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/LoadTestDataPlugins.kt (99%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/LocalPluginManager.kt (84%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/Plugin.kt (84%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/PluginCache.kt (94%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/PluginManager.kt (96%) rename plugin/src/main/kotlin/edu/wpi/{axon => inndie}/plugin/ProcessTestOutputPlugins.kt (91%) rename plugin/src/test/kotlin/edu/wpi/{axon => inndie}/plugin/LocalPluginManagerTest.kt (83%) rename test-runner/src/main/kotlin/edu/wpi/{axon => inndie}/testrunner/LocalTestRunner.kt (91%) rename test-runner/src/main/kotlin/edu/wpi/{axon => inndie}/testrunner/TestData.kt (71%) rename test-runner/src/main/kotlin/edu/wpi/{axon => inndie}/testrunner/TestRunner.kt (92%) rename test-runner/src/test/kotlin/edu/wpi/{axon => inndie}/testrunner/LocalTestRunnerIntegTest.kt (95%) rename test-runner/src/test/resources/edu/wpi/{axon => inndie}/testrunner/32_32_1_conv_sequential-trained.h5 (100%) rename test-util/src/main/kotlin/edu/wpi/{axon => inndie}/testutil/KoinTestFixture.kt (92%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/DefaultExampleDatasetToCode.kt (96%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/ExampleDatasetToCode.kt (84%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/PythonUtil.kt (93%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/ConstraintToCode.kt (79%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultConstraintToCode.kt (89%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultInitializerToCode.kt (94%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultLayerToCode.kt (96%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultRegularizerToCode.kt (76%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/InitializerToCode.kt (79%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/LayerToCode.kt (80%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/RegularizerToCode.kt (79%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/loss/DefaultLossToCode.kt (82%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/loss/LossToCode.kt (75%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/optimizer/DefaultOptimizerToCode.kt (86%) rename tf-data-code/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/code/optimizer/OptimizerToCode.kt (74%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/DefaultExampleDatasetToCodeTest.kt (84%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultConstraintToCodeTest.kt (93%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultInitializerToCodeTest.kt (93%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultLayerToCodeTest.kt (90%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/layer/DefaultRegularizerToCodeTest.kt (90%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/loss/DefaultLossToCodeTest.kt (92%) rename tf-data-code/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt (92%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/Dataset.kt (97%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/Model.kt (95%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/ModelCheckpointSaveFrequency.kt (95%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/SerializerUtil.kt (86%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/Verbosity.kt (94%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Activation.kt (90%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Constraint.kt (96%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/DataFormat.kt (85%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Initializer.kt (97%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Interpolation.kt (82%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Layer.kt (90%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/PoolingPadding.kt (81%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/layer/Regularizer.kt (74%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/loss/Loss.kt (94%) rename tf-data/src/main/kotlin/edu/wpi/{axon => inndie}/tfdata/optimizer/Optimizer.kt (97%) delete mode 100644 tf-data/src/test/kotlin/edu/wpi/axon/tfdata/layer/LayerTest.kt rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/DatasetTest.kt (96%) rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/ModelCheckpointSaveFrequencyTest.kt (92%) rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/ModelTest.kt (76%) rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/VerbosityTest.kt (93%) create mode 100644 tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/layer/LayerTest.kt rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/loss/LossTest.kt (94%) rename tf-data/src/test/kotlin/edu/wpi/{axon => inndie}/tfdata/optimizer/OptimizerTest.kt (86%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/DefaultLayersToGraph.kt (90%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/HDF5ModelLoader.kt (94%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LayerGraphUtil.kt (95%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LayersToGraph.kt (76%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/ModelLoader.kt (80%) rename tf-layer-loader/src/main/kotlin/edu/wpi/{axon => inndie}/tflayerloader/ModelLoaderFactory.kt (93%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/DefaultLayersToGraphTest.kt (96%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/HDF5ModelLoaderIntegrationTest.kt (90%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt (92%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt (92%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt (78%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt (76%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/ModelLoaderFactoryTest.kt (94%) rename tf-layer-loader/src/test/kotlin/edu/wpi/{axon => inndie}/tflayerloader/ModelTestUtil.kt (93%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/badModel1.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/mobilenetv2_1.00_224.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/mobilenetv2_tf-1-15.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/model1.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/nonSequentialModel1.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/rnn1.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_avgpool2d.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_constant_int_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_constant_list_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_constant_nparray_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_constant_tuple_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_globalmaxpooling2d.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_glorotnormal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_glorotuniform_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_identity_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_l1_regularizer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_maxnorm_constraint.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_minmaxnorm_constraint.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_nonneg_constraint.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_orthogonal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_randomnormal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_randomuniform_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_randomuniform_tensor_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_spatialdropout2d.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_truncatednormal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_unitnorm_constraint.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_upsampling2d_bilinear.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_upsampling2d_nearest.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_variancescaling_fanavg_truncatednormal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_variancescaling_fanavg_untruncatednormal_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_variancescaling_fanin_uniform_initializer.h5 (100%) rename tf-layer-loader/src/test/resources/edu/wpi/{axon => inndie}/tflayerloader/sequential_with_variancescaling_fanout_normal_initializer.h5 (100%) rename training-test-util/src/main/kotlin/edu/wpi/{axon => inndie}/training/testutil/TrainTestUtil.kt (91%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/LoadedDataset.kt (87%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/ModelDeploymentTarget.kt (97%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/TrainGeneralModelScriptGenerator.kt (85%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/TrainModelScriptGenerator.kt (86%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/TrainSequentialModelScriptGenerator.kt (86%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/TrainState.kt (70%) rename training/src/main/kotlin/edu/wpi/{axon => inndie}/training/TrainUtil.kt (87%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/Conv32321IntegrationTest.kt (80%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/Mobilenet-v-1-14-IntegrationTest.kt (79%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/Mobilenet-v-1-15-IntegrationTest.kt (81%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt (92%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/TrainIntegrationTest.kt (85%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt (85%) rename training/src/test/kotlin/edu/wpi/{axon => inndie}/training/TrainStateTest.kt (90%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/32_32_1_conv_general.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/32_32_1_conv_sequential.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/WPILib_reduced.tar (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/badModel1.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/custom_fashion_mnist.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/mobilenet_tf_1_15_0.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/mobilenetv2_1.00_224.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/mobilenetv2_tf-1-15.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/network_with_add.h5 (100%) rename training/src/test/resources/edu/wpi/{axon => inndie}/training/small_model_for_wpilib_reduced_dataset.h5 (100%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/JobLifecycleManager.kt (92%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/JobRunner.kt (75%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/ModelManager.kt (83%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/controller/JobBoard.kt (89%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/controller/PluginStore.kt (79%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/controller/WizardTaskService.kt (87%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/main/FrontendKoinModules.kt (68%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon/ui/main/Axon.kt => inndie/ui/main/INNDiE.kt} (87%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/AdamModel.kt (94%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/CoralModel.kt (90%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/Dataset.kt (87%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/FTRLModel.kt (96%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/Job.kt (91%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/ModelSourceType.kt (60%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/PluginModel.kt (86%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/PreferencesModel.kt (84%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/RMSpropModel.kt (94%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/model/WizardTask.kt (72%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/About.kt (75%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/ContentMap.kt (97%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/JobManager.kt (70%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/Main.kt (89%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/TornadoUtil.kt (98%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/DatasetPicker.kt (90%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/JobConfiguration.kt (94%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/JobEditor.kt (91%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/LossFragment.kt (92%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/ModelPicker.kt (92%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/OptimizerFragment.kt (90%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobeditor/TargetFragment.kt (89%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/joblist/JobList.kt (88%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/joblist/JobListFragment.kt (94%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/joblist/JobWizard.kt (95%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobresult/JobResultsView.kt (96%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobresult/LazyResult.kt (89%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobresult/ResultFragment.kt (98%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobtestview/JobTestView.kt (92%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobtestview/JobTestViewModel.kt (76%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobtestview/TestDataType.kt (59%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/jobtestview/TestResultFragment.kt (84%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/layereditor/LayerCell.kt (97%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/layereditor/LayerEditor.kt (97%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/layereditor/LayerEditorFragment.kt (90%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/layereditor/TrainableLayerModel.kt (86%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/layereditor/UntrainableLayerModel.kt (65%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/preferences/PluginEditor.kt (94%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/preferences/PluginManagerEditor.kt (89%) rename ui-javafx/src/main/kotlin/edu/wpi/{axon => inndie}/ui/view/preferences/PreferencesView.kt (89%) delete mode 100644 util/src/main/kotlin/edu/wpi/axon/util/KoinNames.kt rename util/src/main/kotlin/edu/wpi/{axon => inndie}/util/FilePath.kt (88%) rename util/src/main/kotlin/edu/wpi/{axon => inndie}/util/GraphUtil.kt (97%) rename util/src/main/kotlin/edu/wpi/{axon => inndie}/util/InitializedPropertyModificationException.kt (92%) create mode 100644 util/src/main/kotlin/edu/wpi/inndie/util/KoinNames.kt rename util/src/main/kotlin/edu/wpi/{axon => inndie}/util/SingleAssign.kt (88%) rename util/src/main/kotlin/edu/wpi/{axon => inndie}/util/Util.kt (96%) diff --git a/README.md b/README.md index 5e508c03..8ee80082 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -[![Build Status](https://dev.azure.com/wpilib/DesktopTools/_apis/build/status/wpilibsuite.Axon?branchName=master)](https://dev.azure.com/wpilib/DesktopTools/_build/latest?definitionId=34&branchName=master) -[![Github Releases](https://img.shields.io/github/downloads/wpilibsuite/Axon/total.svg)](https://github.com/wpilibsuite/Axon/releases/latest) -[![codecov](https://codecov.io/gh/wpilibsuite/Axon/branch/master/graph/badge.svg)](https://codecov.io/gh/wpilibsuite/Axon) +[![Build Status](https://dev.azure.com/wpilib/DesktopTools/_apis/build/status/wpilibsuite.INNDiE?branchName=master)](https://dev.azure.com/wpilib/DesktopTools/_build/latest?definitionId=44&branchName=master) +[![Github Releases](https://img.shields.io/github/downloads/wpilibsuite/INNDiE/total.svg)](https://github.com/wpilibsuite/INNDiE/releases/latest) +[![codecov](https://codecov.io/gh/wpilibsuite/INNDiE/branch/master/graph/badge.svg)](https://codecov.io/gh/wpilibsuite/INNDiE) -# Axon +# INNDiE -Axon - A Graphical Neural Network Editor +INNDiE: An Integrated Neural Network Development Environment A Computer Science and Robotic Engineering Major Qualifying Project submitted to the Faculty of Worcester Polytechnic Institute in partial fulfillment of the @@ -66,7 +66,7 @@ loads each one. ### Plugins -Axon uses a simple plugin system to generalize over many different datasets and models. +INNDiE uses a simple plugin system to generalize over many different datasets and models. #### Dataset Plugins @@ -105,7 +105,7 @@ for how to use `steps`. After the inference step of a test run has completed, the input and output to/from the model is given to a test output processing plugin. This plugin is responsible for interpreting the output of the model and writing any test results to a folder in the current directory called `output`. Any -files put into this directory will be presented to the user in Axon's test view UI. These plugins +files put into this directory will be presented to the user in INNDiE's test view UI. These plugins must implement this function: ```python def process_model_output(model_input, model_output): @@ -120,34 +120,34 @@ the output directly from the model. ## AWS Integration -### S3 Directories Managed by Axon +### S3 Directories Managed by INNDiE -Inside Axon's autogenerated S3 bucket (named with a prefix `axon-autogenerated-` followed by some -random alphanumeric characters for uniqueness), Axon manages these directories: +Inside INNDiE's autogenerated S3 bucket (named with a prefix `inndie-autogenerated-` followed by some +random alphanumeric characters for uniqueness), INNDiE manages these directories: -- axon-untrained-models +- inndie-untrained-models - Contains “untrained” models that the user can use to create a new Job with - These models cannot be used for testing because they are assumed to not contain any weights (or at least not any meaningful weights) -- axon-training-results +- inndie-training-results - Contains all results from running a training script -- axon-test-data +- inndie-test-data - Contains test data files that can be used with the test view -- axon-datasets +- inndie-datasets - Contains the user's custom datasets -- axon-training-scripts +- inndie-training-scripts - Contains generated training scripts -- axon-training-progress - - Contains training progress files that Axon polls to get training progress updates -- axon-plugins +- inndie-training-progress + - Contains training progress files that INNDiE polls to get training progress updates +- inndie-plugins - Unofficial plugins are stored here ### AWS Configuration -- Security Group for ECS named `axon-autogenerated-ecs-sg` -- Security Group for EC2 named `axon-autogenerated-ec2-sg` -- Security Group for RDS named `axon-autogenerated-rds-sg` -- Task role for ECS named `axon-autogenerated-ecs-task-role` -- IAM role for EC2 named `axon-autogenerated-ec2-role` -- Instance profile for EC2 named `axon-autogenerated-ec2-instance-profile` -- ECS Cluster named `axon-autogenerated-cluster` -- ECS Task Definition named `axon-autogenerated-task-family` +- Security Group for ECS named `inndie-autogenerated-ecs-sg` +- Security Group for EC2 named `inndie-autogenerated-ec2-sg` +- Security Group for RDS named `inndie-autogenerated-rds-sg` +- Task role for ECS named `inndie-autogenerated-ecs-task-role` +- IAM role for EC2 named `inndie-autogenerated-ec2-role` +- Instance profile for EC2 named `inndie-autogenerated-ec2-instance-profile` +- ECS Cluster named `inndie-autogenerated-cluster` +- ECS Task Definition named `inndie-autogenerated-task-family` diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2Manager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2Manager.kt similarity index 91% rename from aws/src/main/kotlin/edu/wpi/axon/aws/EC2Manager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/EC2Manager.kt index a6f829d2..11a76315 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2Manager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2Manager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws import java.util.Base64 import mu.KotlinLogging @@ -21,7 +21,7 @@ class EC2Manager { * * @param scriptData The data for the EC2 instance to run when it boots. This should not * contain the entire training script, as that would be too much data. Instead, this script - * should use Axon's CLI to download the training script from S3 at runtime. + * should use INNDiE's CLI to download the training script from S3 at runtime. * @param instanceType The type of the instance to start. * @return The ID of the instance that was started. */ @@ -32,9 +32,9 @@ class EC2Manager { .maxCount(1) .minCount(1) .userData(scriptData.toBase64()) - .securityGroups("axon-autogenerated-ec2-sg") + .securityGroups("inndie-autogenerated-ec2-sg") .instanceInitiatedShutdownBehavior(ShutdownBehavior.TERMINATE) - .iamInstanceProfile { it.name("axon-autogenerated-ec2-instance-profile") } + .iamInstanceProfile { it.name("inndie-autogenerated-ec2-instance-profile") } } return runInstancesResponse.instances().first().instanceId() diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingResultSupplier.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingResultSupplier.kt similarity index 83% rename from aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingResultSupplier.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingResultSupplier.kt index 57711ef0..c76bc2e2 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingResultSupplier.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingResultSupplier.kt @@ -1,8 +1,9 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws import java.io.File -class EC2TrainingResultSupplier(private val s3Manager: S3Manager) : TrainingResultSupplier { +class EC2TrainingResultSupplier(private val s3Manager: S3Manager) : + TrainingResultSupplier { override fun listResults(id: Int): List = s3Manager.listTrainingResults(id) diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptCanceller.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptCanceller.kt similarity index 96% rename from aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptCanceller.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptCanceller.kt index 37132621..a5823a72 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptCanceller.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptCanceller.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws /** * A [TrainingScriptCanceller] that is designed for an [EC2TrainingScriptRunner]. diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporter.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporter.kt similarity index 93% rename from aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporter.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporter.kt index dc49587b..9af0233f 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporter.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporter.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.util.getLatestEpochFromProgressCsv +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.util.getLatestEpochFromProgressCsv import java.lang.NumberFormatException import mu.KotlinLogging import software.amazon.awssdk.services.ec2.model.InstanceStateName @@ -78,12 +78,13 @@ class EC2TrainingScriptProgressReporter( """.trimMargin() } - val progressAssumingEverythingIsFine = computeProgressAssumingEverythingIsFine( - heartbeat, - progress, - status, - epochs - ) + val progressAssumingEverythingIsFine = + computeProgressAssumingEverythingIsFine( + heartbeat, + progress, + status, + epochs + ) if ((status == InstanceStateName.SHUTTING_DOWN || status == InstanceStateName.TERMINATED || diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunner.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunner.kt similarity index 78% rename from aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunner.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunner.kt index bbcd76e3..604505b4 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunner.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunner.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath import mu.KotlinLogging import org.apache.commons.lang3.RandomStringUtils import org.koin.core.KoinComponent @@ -26,9 +26,15 @@ class EC2TrainingScriptRunner( private val instanceIds = mutableMapOf() private val scriptDataMap = mutableMapOf() - private val progressReporter = EC2TrainingScriptProgressReporter(ec2Manager, s3Manager) - private val canceller = EC2TrainingScriptCanceller(ec2Manager) - private val resultSupplier = EC2TrainingResultSupplier(s3Manager) + private val progressReporter = + EC2TrainingScriptProgressReporter( + ec2Manager, + s3Manager + ) + private val canceller = + EC2TrainingScriptCanceller(ec2Manager) + private val resultSupplier = + EC2TrainingResultSupplier(s3Manager) override fun startScript( config: RunTrainingScriptConfiguration @@ -65,7 +71,7 @@ class EC2TrainingScriptRunner( val downloadDatasetString = when (config.dataset) { is Dataset.ExampleDataset -> "" is Dataset.Custom -> - """axon download-dataset "${config.dataset.path.path}"""" + """inndie download-dataset "${config.dataset.path.path}"""" } val scriptForEC2 = """ @@ -81,17 +87,17 @@ class EC2TrainingScriptRunner( |apt-cache policy docker-ce |apt install -y docker-ce |systemctl status docker - |pip3 install https://github.com/wpilibsuite/axon-cli/releases/download/v0.1.17/axon-0.1.17-py2.py3-none-any.whl - |axon create-heartbeat ${config.id} - |axon update-training-progress ${config.id} "initializing" - |axon download-model "${config.oldModelName.path}" + |pip3 install https://github.com/wpilibsuite/INNDiE-cli/releases/download/v0.1.18/inndie-0.1.18-py2.py3-none-any.whl + |inndie create-heartbeat ${config.id} + |inndie update-training-progress ${config.id} "initializing" + |inndie download-model "${config.oldModelName.path}" |$downloadDatasetString - |axon download-training-script "$scriptFileName" - |docker run -v ${'$'}(eval "pwd"):/home wpilib/axon-ci:latest "/usr/bin/python3.6" "/home/$scriptFileName" - |axon upload-training-results ${config.id} "${config.workingDir}" - |axon update-training-progress ${config.id} "completed" - |axon remove-heartbeat ${config.id} - |axon set-training-log-file ${config.id} "/var/log/syslog" + |inndie download-training-script "$scriptFileName" + |docker run -v ${'$'}(eval "pwd"):/home wpilib/inndie-ci:latest "/usr/bin/python3.6" "/home/$scriptFileName" + |inndie upload-training-results ${config.id} "${config.workingDir}" + |inndie update-training-progress ${config.id} "completed" + |inndie remove-heartbeat ${config.id} + |inndie set-training-log-file ${config.id} "/var/log/syslog" |shutdown -h now """.trimMargin() diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/LoadPreferences.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/LoadPreferences.kt similarity index 72% rename from aws/src/main/kotlin/edu/wpi/axon/aws/LoadPreferences.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/LoadPreferences.kt index 51056059..6a4ab5cd 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/LoadPreferences.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/LoadPreferences.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws import arrow.core.None import arrow.core.Option @@ -8,19 +8,19 @@ import software.amazon.awssdk.core.exception.SdkClientException import software.amazon.awssdk.services.s3.S3Client /** - * Finds the S3 bucket Axon will work out of. Returns [None] if there is no matching bucket, which - * causes Axon to run locally and not interface with AWS. The AWS region MUST be auto-detectable + * Finds the S3 bucket INNDiE will work out of. Returns [None] if there is no matching bucket, which + * causes INNDiE to run locally and not interface with AWS. The AWS region MUST be auto-detectable * from the environment (like when running on ECS). To use AWS when running locally, set * `AWS_REGION` to your preferred region. To not use AWS when running locally, do not set * `AWS_REGION`. * * @return The name of the bucket or [None] if the bucket could not be found. */ -fun findAxonS3Bucket(): Option = try { +fun findINNDiES3Bucket(): Option = try { val s3Client = S3Client.builder().build() val bucket = s3Client.listBuckets().buckets().first { - it.name().startsWith("axon-autogenerated-") + it.name().startsWith("inndie-autogenerated-") } LOGGER.info { "Starting with S3 bucket: $bucket" } diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingResultSupplier.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingResultSupplier.kt similarity index 96% rename from aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingResultSupplier.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingResultSupplier.kt index 0f3c5be4..0dea2dad 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingResultSupplier.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingResultSupplier.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws import java.io.File import java.nio.file.Path diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptCanceller.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptCanceller.kt similarity index 88% rename from aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptCanceller.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptCanceller.kt index eafc5ef1..c60e53c8 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptCanceller.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptCanceller.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress +import edu.wpi.inndie.db.data.TrainingScriptProgress /** * A [TrainingScriptCanceller] that is designed for an [LocalTrainingScriptRunner]. @@ -23,7 +23,7 @@ class LocalTrainingScriptCanceller : TrainingScriptCanceller { } /** - * Adds a Job that was pulled from the DB after Axon was restarted (so there is no thread data). + * Adds a Job that was pulled from the DB after INNDiE was restarted (so there is no thread data). * * @param jobId The Job ID. * @param updateProgress A callback used to update the progress of the Job. diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporter.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporter.kt similarity index 91% rename from aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporter.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporter.kt index ddbd6bb5..262a4b15 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporter.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporter.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.util.createLocalProgressFilepath -import edu.wpi.axon.util.getLatestEpochFromProgressCsv +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.util.createLocalProgressFilepath +import edu.wpi.inndie.util.getLatestEpochFromProgressCsv import java.lang.NumberFormatException import mu.KotlinLogging @@ -36,7 +36,7 @@ class LocalTrainingScriptProgressReporter : TrainingScriptProgressReporter { } /** - * Adds a Job that was pulled from the DB after Axon was restarted (so there is no progressMap + * Adds a Job that was pulled from the DB after INNDiE was restarted (so there is no progressMap * or thread data). * * @param config The config the Job was started with. @@ -62,7 +62,8 @@ class LocalTrainingScriptProgressReporter : TrainingScriptProgressReporter { // Create the progress file up here to share code but don't read from it unless we have to, // to avoid reading from it if it's not there but didn't have to be - val progressFile = createLocalProgressFilepath(config.workingDir).toFile() + val progressFile = createLocalProgressFilepath(config.workingDir) + .toFile() LOGGER.debug { "Getting training progress for Job $jobId from path ${progressFile.path}" @@ -83,7 +84,10 @@ class LocalTrainingScriptProgressReporter : TrainingScriptProgressReporter { TrainingScriptProgress.Initializing } else { try { - val latestEpoch = getLatestEpochFromProgressCsv(progressText) + val latestEpoch = + getLatestEpochFromProgressCsv( + progressText + ) if (latestEpoch == epochs) { // We need to make sure the progress gets to Completed because the thread is no // longer alive to do it for us. @@ -141,7 +145,10 @@ class LocalTrainingScriptProgressReporter : TrainingScriptProgressReporter { else -> { // Otherwise it must be InProgress try { - val latestEpoch = getLatestEpochFromProgressCsv(progressText) + val latestEpoch = + getLatestEpochFromProgressCsv( + progressText + ) LOGGER.debug { "Latest epoch: $latestEpoch" } TrainingScriptProgress.InProgress( latestEpoch / epochs.toDouble(), diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunner.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunner.kt similarity index 92% rename from aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunner.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunner.kt index 2d252ce8..e939c664 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunner.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunner.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.aws - -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.createLocalProgressFilepath -import edu.wpi.axon.util.getOutputModelName -import edu.wpi.axon.util.runCommand +package edu.wpi.inndie.aws + +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.createLocalProgressFilepath +import edu.wpi.inndie.util.getOutputModelName +import edu.wpi.inndie.util.runCommand import java.nio.file.Paths import kotlin.concurrent.thread import mu.KotlinLogging @@ -103,7 +103,7 @@ class LocalTrainingScriptRunner : TrainingScriptRunner { ) is Dataset.ExampleDataset -> emptyList() } + listOf( - "wpilib/axon-ci:latest", + "wpilib/inndie-ci:latest", "/usr/bin/python3.6", "/home/$scriptFilename" ), @@ -129,7 +129,11 @@ class LocalTrainingScriptRunner : TrainingScriptRunner { } val newModelFile = config.workingDir - .resolve(getOutputModelName(oldModelName.filename)) + .resolve( + getOutputModelName( + oldModelName.filename + ) + ) .toFile() if (newModelFile.exists()) { scriptProgressMap[config.id] = TrainingScriptProgress.Completed diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/RunTrainingScriptConfiguration.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/RunTrainingScriptConfiguration.kt similarity index 86% rename from aws/src/main/kotlin/edu/wpi/axon/aws/RunTrainingScriptConfiguration.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/RunTrainingScriptConfiguration.kt index f868d973..81d35519 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/RunTrainingScriptConfiguration.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/RunTrainingScriptConfiguration.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath import java.nio.file.Path /** diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/S3Manager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/S3Manager.kt similarity index 86% rename from aws/src/main/kotlin/edu/wpi/axon/aws/S3Manager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/S3Manager.kt index 3832a7d9..6286ccd2 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/S3Manager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/S3Manager.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.util.localCacheDir +import edu.wpi.inndie.util.localCacheDir import java.io.File import java.nio.file.Files import mu.KotlinLogging @@ -33,7 +33,7 @@ class S3Manager( * model will be the same as the filename of this file. */ fun uploadModel(file: File) = - uploadLocalFile(file, "axon-models/${file.name}") + uploadLocalFile(file, "inndie-models/${file.name}") /** * Downloads a model. @@ -42,7 +42,7 @@ class S3Manager( * @return A local file containing the model. */ fun downloadModel(filename: String): File = - downloadToLocalFile(modelCacheDir, "axon-models/$filename") + downloadToLocalFile(modelCacheDir, "inndie-models/$filename") /** * Lists the training results for the Job. @@ -51,7 +51,7 @@ class S3Manager( * @return The filenames of the results. */ fun listTrainingResults(jobId: Int): List { - val out = listObjectsWithPrefixAndRemovePrefix("axon-training-results/$jobId/") + val out = listObjectsWithPrefixAndRemovePrefix("inndie-training-results/$jobId/") LOGGER.debug { "Training results:\n$out" } return out } @@ -64,14 +64,14 @@ class S3Manager( * @return A local file containing the result. */ fun downloadTrainingResult(jobId: Int, resultFilename: String): File = - downloadToLocalFile(trainingResultCacheDir, "axon-training-results/$jobId/$resultFilename") + downloadToLocalFile(trainingResultCacheDir, "inndie-training-results/$jobId/$resultFilename") /** * Uploads a test data file. * * @param file The local test data file. */ - fun uploadTestDataFile(file: File) = uploadLocalFile(file, "axon-test-data/${file.name}") + fun uploadTestDataFile(file: File) = uploadLocalFile(file, "inndie-test-data/${file.name}") /** * Downloads a test data file to a local file. @@ -80,7 +80,7 @@ class S3Manager( * @return The test data in a local file. */ fun downloadTestDataFile(filename: String): File = - downloadToLocalFile(testDataCacheDir, "axon-test-data/$filename") + downloadToLocalFile(testDataCacheDir, "inndie-test-data/$filename") /** * Lists all the model files. @@ -88,7 +88,7 @@ class S3Manager( * @return A list of the model filenames. */ fun listModels(): List = - listObjectsWithPrefixAndRemovePrefix("axon-models/") + listObjectsWithPrefixAndRemovePrefix("inndie-models/") /** * Lists all the test data files. @@ -96,7 +96,7 @@ class S3Manager( * @return A list of the test data filenames. */ fun listTestDataFiles(): List = - listObjectsWithPrefixAndRemovePrefix("axon-test-data/") + listObjectsWithPrefixAndRemovePrefix("inndie-test-data/") /** * Uploads a training script. @@ -107,7 +107,7 @@ class S3Manager( fun uploadTrainingScript(scriptFilename: String, scriptContents: String) { s3.putObject( PutObjectRequest.builder().bucket(bucketName) - .key("axon-training-scripts/$scriptFilename").build(), + .key("inndie-training-scripts/$scriptFilename").build(), RequestBody.fromString(scriptContents) ) } @@ -139,7 +139,7 @@ class S3Manager( } /** - * Creates a heartbeat that Axon uses to check if the training script is running properly. + * Creates a heartbeat that INNDiE uses to check if the training script is running properly. * * @param id The unique Job ID. */ @@ -153,7 +153,7 @@ class S3Manager( } /** - * Removes a heartbeat that Axon uses to check if the training script is running properly. + * Removes a heartbeat that INNDiE uses to check if the training script is running properly. * * @param id The unique Job ID. */ @@ -185,7 +185,7 @@ class S3Manager( fun clearTrainingLogFile(id: Int) { s3.putObject( PutObjectRequest.builder().bucket(bucketName) - .key("axon-training-progress/$id/log.txt").build(), + .key("inndie-training-progress/$id/log.txt").build(), RequestBody.fromString("") ) } @@ -198,7 +198,7 @@ class S3Manager( */ @UseExperimental(ExperimentalStdlibApi::class) fun getTrainingLogFile(id: Int) = s3.getObject { - it.bucket(bucketName).key("axon-training-progress/$id/log.txt") + it.bucket(bucketName).key("inndie-training-progress/$id/log.txt") }.readAllBytes().decodeToString() /** @@ -208,7 +208,7 @@ class S3Manager( * @param file The plugin cache file. */ fun uploadPluginCache(cacheName: String, file: File) = - uploadLocalFile(file, "axon-plugins/$cacheName/plugin_cache.json") + uploadLocalFile(file, "inndie-plugins/$cacheName/plugin_cache.json") /** * Downloads a plugin cache file. @@ -217,7 +217,7 @@ class S3Manager( * @return A local file containing the plugin cache. */ fun downloadPluginCache(cacheName: String): File = - downloadToLocalFile(pluginCacheDir, "axon-plugins/$cacheName/plugin_cache.json") + downloadToLocalFile(pluginCacheDir, "inndie-plugins/$cacheName/plugin_cache.json") /** * Uploads a custom dataset. @@ -225,7 +225,7 @@ class S3Manager( * @param dataset The dataset file to upload. */ fun uploadDataset(dataset: File) = - uploadLocalFile(dataset, "axon-datasets/${dataset.name}") + uploadLocalFile(dataset, "inndie-datasets/${dataset.name}") /** * Downloads a custom dataset to a local file. @@ -234,7 +234,7 @@ class S3Manager( * @return A local file containing the dataset. */ fun downloadDataset(datasetFilename: String): File = - downloadToLocalFile(datasetCacheDir, "axon-datasets/$datasetFilename") + downloadToLocalFile(datasetCacheDir, "inndie-datasets/$datasetFilename") /** * Downloads the preferences file to a local file. Throws an exception if there is no @@ -310,7 +310,7 @@ class S3Manager( it.bucket(bucketName).prefix(prefix).maxKeys(1000) }.contents().map { it.key().substring(prefix.length) } - private fun createTrainingProgressPrefix(id: Int) = "axon-training-progress/$id" + private fun createTrainingProgressPrefix(id: Int) = "inndie-training-progress/$id" private fun createTrainingProgressFilePath(id: Int) = "${createTrainingProgressPrefix(id)}/progress.txt" @@ -320,6 +320,6 @@ class S3Manager( companion object { private val LOGGER = KotlinLogging.logger { } - private const val preferencesFilename = "axon-preferences.json" + private const val preferencesFilename = "inndie-preferences.json" } } diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/S3PreferencesManager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/S3PreferencesManager.kt similarity index 70% rename from aws/src/main/kotlin/edu/wpi/axon/aws/S3PreferencesManager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/S3PreferencesManager.kt index 279660bb..0a2db64f 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/S3PreferencesManager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/S3PreferencesManager.kt @@ -1,13 +1,14 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.aws.preferences.Preferences -import edu.wpi.axon.aws.preferences.PreferencesManager -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.aws.preferences.Preferences +import edu.wpi.inndie.aws.preferences.PreferencesManager +import edu.wpi.inndie.util.singleAssign import java.io.File import java.nio.file.Files import kotlin.concurrent.thread import kotlin.properties.Delegates import software.amazon.awssdk.core.exception.SdkClientException +import software.amazon.awssdk.services.s3.model.NoSuchKeyException /** * Manages the preferences data lifecycle. Stores preferences in S3. @@ -27,11 +28,17 @@ class S3PreferencesManager( preferencesFile = s3Manager.downloadPreferences() workingPreferences = Preferences.deserialize(preferencesFile.readText()) } catch (e: SdkClientException) { - preferencesFile = Files.createTempFile("", "").toFile() - workingPreferences = Preferences() + makeNewPreferences() + } catch (e: NoSuchKeyException) { + makeNewPreferences() } } + private fun makeNewPreferences() { + preferencesFile = Files.createTempFile("", "").toFile() + workingPreferences = Preferences() + } + override fun put(preferences: Preferences) { workingPreferences = preferences thread(isDaemon = true) { diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingResultSupplier.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingResultSupplier.kt similarity index 94% rename from aws/src/main/kotlin/edu/wpi/axon/aws/TrainingResultSupplier.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingResultSupplier.kt index e720e546..b2e22aac 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingResultSupplier.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingResultSupplier.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws import java.io.File diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptCanceller.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptCanceller.kt similarity index 92% rename from aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptCanceller.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptCanceller.kt index bdd466d6..073db477 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptCanceller.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptCanceller.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws interface TrainingScriptCanceller { diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptProgressReporter.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptProgressReporter.kt similarity index 90% rename from aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptProgressReporter.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptProgressReporter.kt index 56e4f04d..b3b85bb0 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptProgressReporter.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptProgressReporter.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress +import edu.wpi.inndie.db.data.TrainingScriptProgress interface TrainingScriptProgressReporter { diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptRunner.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptRunner.kt similarity index 91% rename from aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptRunner.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptRunner.kt index d9d5c16a..8c8beb63 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/TrainingScriptRunner.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/TrainingScriptRunner.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws interface TrainingScriptRunner : TrainingScriptProgressReporter, TrainingScriptCanceller, TrainingResultSupplier { diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/plugin/S3PluginManager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManager.kt similarity index 81% rename from aws/src/main/kotlin/edu/wpi/axon/aws/plugin/S3PluginManager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManager.kt index 82eda7c3..5b6bf283 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/plugin/S3PluginManager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManager.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.aws.plugin +package edu.wpi.inndie.aws.plugin -import edu.wpi.axon.aws.S3Manager -import edu.wpi.axon.plugin.LocalPluginManager -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.plugin.PluginManager +import edu.wpi.inndie.aws.S3Manager +import edu.wpi.inndie.plugin.LocalPluginManager +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.plugin.PluginManager import java.io.File import java.nio.file.Files import mu.KotlinLogging @@ -14,7 +14,7 @@ import software.amazon.awssdk.services.s3.model.NoSuchKeyException * * @param s3Manager Used for interacting with S3. * @param cacheName The name of the plugin cache. - * @param officialPlugins The Axon-supported official plugins that should always be available to the + * @param officialPlugins The INNDiE-supported official plugins that should always be available to the * user. */ class S3PluginManager( @@ -33,7 +33,8 @@ class S3PluginManager( LOGGER.warn(ex) { "Failed to download plugin cache from S3. Creating a new one." } Files.createTempFile("", ".json").toFile().apply { createNewFile() } } - localPluginManager = LocalPluginManager(cacheFile, officialPlugins) + localPluginManager = + LocalPluginManager(cacheFile, officialPlugins) localPluginManager.initialize() } diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManager.kt similarity index 97% rename from aws/src/main/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManager.kt index 6dd8b763..0d352b8f 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws.preferences +package edu.wpi.inndie.aws.preferences import java.io.File import java.nio.file.Path diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/Preferences.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/Preferences.kt similarity index 95% rename from aws/src/main/kotlin/edu/wpi/axon/aws/preferences/Preferences.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/Preferences.kt index 53122895..a8b544eb 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/Preferences.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/Preferences.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws.preferences +package edu.wpi.inndie.aws.preferences import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/PreferencesManager.kt b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/PreferencesManager.kt similarity index 93% rename from aws/src/main/kotlin/edu/wpi/axon/aws/preferences/PreferencesManager.kt rename to aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/PreferencesManager.kt index 8acbc9f5..272e61e9 100644 --- a/aws/src/main/kotlin/edu/wpi/axon/aws/preferences/PreferencesManager.kt +++ b/aws/src/main/kotlin/edu/wpi/inndie/aws/preferences/PreferencesManager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws.preferences +package edu.wpi.inndie.aws.preferences /** * Manages the preferences data lifecycle. diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporterTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporterTest.kt similarity index 98% rename from aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporterTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporterTest.kt index 94543eae..8cd5fc5d 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptProgressReporterTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptProgressReporterTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress +import edu.wpi.inndie.db.data.TrainingScriptProgress import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunnerTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunnerTest.kt similarity index 97% rename from aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunnerTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunnerTest.kt index 0758c4df..9b5879ad 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/EC2TrainingScriptRunnerTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/EC2TrainingScriptRunnerTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath import io.kotlintest.should import io.kotlintest.shouldBe import io.kotlintest.shouldThrow diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporterTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporterTest.kt similarity index 93% rename from aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporterTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporterTest.kt index 259bee71..14a367fe 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptProgressReporterTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptProgressReporterTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.createLocalProgressFilepath +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.createLocalProgressFilepath import io.kotlintest.shouldBe import java.io.File import org.apache.commons.lang3.RandomStringUtils diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerIntegTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerIntegTest.kt similarity index 96% rename from aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerIntegTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerIntegTest.kt index ea48fc21..1c753356 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerIntegTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerIntegTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.getOutputModelName +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.getOutputModelName import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.file.shouldExist import io.kotlintest.matchers.types.shouldBeInstanceOf @@ -261,7 +261,11 @@ internal class LocalTrainingScriptRunnerIntegTest { runner.cancelScript(id) val progressAfterCancellation = runner.getTrainingProgress(id) progressAfterCancellation.shouldBeInstanceOf() - tempDir.toPath().resolve(getOutputModelName(oldModelName)).toFile() + tempDir.toPath().resolve( + getOutputModelName( + oldModelName + ) + ).toFile() .exists().shouldBeFalse() return // Done with the test } diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerTest.kt similarity index 94% rename from aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerTest.kt index 1d82a0ea..5c0b6cdf 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/LocalTrainingScriptRunnerTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/LocalTrainingScriptRunnerTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath import io.kotlintest.shouldThrow import java.io.File import org.junit.jupiter.api.Test diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/TestUtil.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/TestUtil.kt similarity index 82% rename from aws/src/test/kotlin/edu/wpi/axon/aws/TestUtil.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/TestUtil.kt index c34a0218..80638ad9 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/TestUtil.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/TestUtil.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.aws +package edu.wpi.inndie.aws -import edu.wpi.axon.db.data.nextDataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.db.data.nextDataset +import edu.wpi.inndie.util.FilePath import java.io.File import kotlin.random.Random import org.apache.commons.lang3.RandomStringUtils diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/plugin/S3PluginManagerTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManagerTest.kt similarity index 84% rename from aws/src/test/kotlin/edu/wpi/axon/aws/plugin/S3PluginManagerTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManagerTest.kt index ef6dcf84..dd3952f5 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/plugin/S3PluginManagerTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/plugin/S3PluginManagerTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.aws.plugin +package edu.wpi.inndie.aws.plugin -import edu.wpi.axon.aws.S3Manager -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.plugin.PluginCache +import edu.wpi.inndie.aws.S3Manager +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.plugin.PluginCache import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder import io.mockk.every import io.mockk.mockk @@ -18,7 +18,13 @@ internal class S3PluginManagerTest { val pluginCacheFile = File(tempDir, "cache.json").apply { createNewFile() } val plugin1 = Plugin.Unofficial("a", "a") val plugin2 = Plugin.Unofficial("b", "b") - pluginCacheFile.writeText(PluginCache(setOf(plugin1, plugin2)).serialize()) + pluginCacheFile.writeText( + PluginCache( + setOf( + plugin1, + plugin2 + ) + ).serialize()) val s3Manager = mockk { every { downloadPluginCache(any()) } returns pluginCacheFile @@ -62,7 +68,13 @@ internal class S3PluginManagerTest { val pluginCacheFile = File(tempDir, "cache.json").apply { createNewFile() } val plugin1 = Plugin.Unofficial("a", "a") val plugin2 = Plugin.Unofficial("b", "b") - pluginCacheFile.writeText(PluginCache(setOf(plugin1, plugin2)).serialize()) + pluginCacheFile.writeText( + PluginCache( + setOf( + plugin1, + plugin2 + ) + ).serialize()) val s3Manager = mockk { every { downloadPluginCache(any()) } returns pluginCacheFile @@ -88,7 +100,13 @@ internal class S3PluginManagerTest { val plugin1 = Plugin.Unofficial("a", "a") val plugin2 = Plugin.Unofficial("b", "b") val newPlugin1 = Plugin.Unofficial("a", "a1") - pluginCacheFile.writeText(PluginCache(setOf(plugin1, plugin2)).serialize()) + pluginCacheFile.writeText( + PluginCache( + setOf( + plugin1, + plugin2 + ) + ).serialize()) val s3Manager = mockk { every { downloadPluginCache(any()) } returns pluginCacheFile diff --git a/aws/src/test/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManagerTest.kt b/aws/src/test/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManagerTest.kt similarity index 95% rename from aws/src/test/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManagerTest.kt rename to aws/src/test/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManagerTest.kt index dca8d8be..61fa2ba4 100644 --- a/aws/src/test/kotlin/edu/wpi/axon/aws/preferences/LocalPreferencesManagerTest.kt +++ b/aws/src/test/kotlin/edu/wpi/inndie/aws/preferences/LocalPreferencesManagerTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.aws.preferences +package edu.wpi.inndie.aws.preferences import io.kotlintest.shouldBe import java.io.File diff --git a/aws/src/test/resources/edu/wpi/axon/aws/custom_fashion_mnist.h5 b/aws/src/test/resources/edu/wpi/inndie/aws/custom_fashion_mnist.h5 similarity index 100% rename from aws/src/test/resources/edu/wpi/axon/aws/custom_fashion_mnist.h5 rename to aws/src/test/resources/edu/wpi/inndie/aws/custom_fashion_mnist.h5 diff --git a/db-test-util/src/main/kotlin/edu/wpi/axon/db/data/TestUtil.kt b/db-test-util/src/main/kotlin/edu/wpi/inndie/db/data/TestUtil.kt similarity index 84% rename from db-test-util/src/main/kotlin/edu/wpi/axon/db/data/TestUtil.kt rename to db-test-util/src/main/kotlin/edu/wpi/inndie/db/data/TestUtil.kt index d112f881..4e6e1121 100644 --- a/db-test-util/src/main/kotlin/edu/wpi/axon/db/data/TestUtil.kt +++ b/db-test-util/src/main/kotlin/edu/wpi/inndie/db/data/TestUtil.kt @@ -1,18 +1,18 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.examplemodel.ExampleModel -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableTuple2II -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.getOutputModelName +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.examplemodel.ExampleModel +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.getOutputModelName import kotlin.random.Random import org.apache.commons.lang3.RandomStringUtils @@ -43,13 +43,17 @@ fun Random.nextTrainingScriptProgress(): TrainingScriptProgress = ) } 4 -> TrainingScriptProgress.Completed - 5 -> TrainingScriptProgress.Error(RandomStringUtils.randomAlphanumeric(50)) + 5 -> TrainingScriptProgress.Error( + RandomStringUtils.randomAlphanumeric(50) + ) else -> error("Missing a TrainingScriptProgress case.") } fun Random.nextTrainingMethod(): InternalJobTrainingMethod = when (nextInt(InternalJobTrainingMethod::class.sealedSubclasses.count())) { - 0 -> InternalJobTrainingMethod.EC2(RandomStringUtils.randomAlphabetic(10)) + 0 -> InternalJobTrainingMethod.EC2( + RandomStringUtils.randomAlphabetic(10) + ) 1 -> InternalJobTrainingMethod.Local 2 -> InternalJobTrainingMethod.Untrained else -> error("Missing a JobTrainingMethod case.") @@ -127,7 +131,9 @@ fun Random.nextJob( Layer.AveragePooling2D(RandomStringUtils.randomAlphanumeric(10), null).untrainable() ) ), - userNewModelPath: String = getOutputModelName(userOldModelPath.filename), + userNewModelPath: String = getOutputModelName( + userOldModelPath.filename + ), generateDebugComments: Boolean = nextBoolean(), trainingMethod: InternalJobTrainingMethod = nextTrainingMethod(), target: ModelDeploymentTarget = nextTarget(), diff --git a/db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt b/db/src/main/kotlin/edu/wpi/inndie/db/JobDb.kt similarity index 93% rename from db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/JobDb.kt index 774f7129..ce655819 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/JobDb.kt @@ -1,17 +1,17 @@ -package edu.wpi.axon.db +package edu.wpi.inndie.db import com.beust.klaxon.Klaxon -import edu.wpi.axon.db.data.InternalJobTrainingMethod -import edu.wpi.axon.db.data.Job -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.db.data.InternalJobTrainingMethod +import edu.wpi.inndie.db.data.Job +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.util.FilePath import org.jetbrains.exposed.dao.IntIdTable import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.ResultRow @@ -197,7 +197,11 @@ class JobDb(private val database: Database) { } fun fetchAll(): List = transaction(database) { - Jobs.selectAll().map { Jobs.toDomain(it) } + Jobs.selectAll().map { + Jobs.toDomain( + it + ) + } } fun fetch(limit: Int, offset: Int): List = transaction(database) { diff --git a/db/src/main/kotlin/edu/wpi/axon/db/data/DesiredJobTrainingMethod.kt b/db/src/main/kotlin/edu/wpi/inndie/db/data/DesiredJobTrainingMethod.kt similarity index 79% rename from db/src/main/kotlin/edu/wpi/axon/db/data/DesiredJobTrainingMethod.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/data/DesiredJobTrainingMethod.kt index edc96473..f0ed8763 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/data/DesiredJobTrainingMethod.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/data/DesiredJobTrainingMethod.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data /** * The method the user wants to use to train the Job. diff --git a/db/src/main/kotlin/edu/wpi/axon/db/data/InternalJobTrainingMethod.kt b/db/src/main/kotlin/edu/wpi/inndie/db/data/InternalJobTrainingMethod.kt similarity index 94% rename from db/src/main/kotlin/edu/wpi/axon/db/data/InternalJobTrainingMethod.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/data/InternalJobTrainingMethod.kt index 63d77f0c..e1164594 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/data/InternalJobTrainingMethod.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/data/InternalJobTrainingMethod.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration /** - * The method used to train a Job. Used to resume progress reporting after Axon is restarted. + * The method used to train a Job. Used to resume progress reporting after INNDiE is restarted. */ @Serializable sealed class InternalJobTrainingMethod { diff --git a/db/src/main/kotlin/edu/wpi/axon/db/data/Job.kt b/db/src/main/kotlin/edu/wpi/inndie/db/data/Job.kt similarity index 79% rename from db/src/main/kotlin/edu/wpi/axon/db/data/Job.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/data/Job.kt index 7d31035e..3b6e8c51 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/data/Job.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/data/Job.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget /** * @param userOldModelPath The path to the model to load. @@ -21,7 +21,7 @@ import edu.wpi.axon.training.ModelDeploymentTarget * @param internalTrainingMethod Do not set this directly, this should always start as * [InternalJobTrainingMethod.Untrained]. If you want to control where the Job is trained, set the * desired training method when the Job is started. This is the method used to train the Job, used - * to resume progress updates if Axon is closed while Jobs are still running. This value is managed + * to resume progress updates if INNDiE is closed while Jobs are still running. This value is managed * by the backend. * @param datasetPlugin The plugin used to process the dataset after it is loaded. * @param id The database-generated unique id. Do not modify. diff --git a/db/src/main/kotlin/edu/wpi/axon/db/data/ModelSource.kt b/db/src/main/kotlin/edu/wpi/inndie/db/data/ModelSource.kt similarity index 88% rename from db/src/main/kotlin/edu/wpi/axon/db/data/ModelSource.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/data/ModelSource.kt index 338402c3..91ace9e9 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/data/ModelSource.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/data/ModelSource.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data -import edu.wpi.axon.examplemodel.ExampleModel -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.examplemodel.ExampleModel +import edu.wpi.inndie.util.FilePath import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration diff --git a/db/src/main/kotlin/edu/wpi/axon/db/data/TrainingScriptProgress.kt b/db/src/main/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgress.kt similarity index 98% rename from db/src/main/kotlin/edu/wpi/axon/db/data/TrainingScriptProgress.kt rename to db/src/main/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgress.kt index 966cb3cc..12ad90cc 100644 --- a/db/src/main/kotlin/edu/wpi/axon/db/data/TrainingScriptProgress.kt +++ b/db/src/main/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgress.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/db/src/test/kotlin/edu/wpi/axon/db/JobDbTest.kt b/db/src/test/kotlin/edu/wpi/inndie/db/JobDbTest.kt similarity index 96% rename from db/src/test/kotlin/edu/wpi/axon/db/JobDbTest.kt rename to db/src/test/kotlin/edu/wpi/inndie/db/JobDbTest.kt index 426ab8a8..5e49dd15 100644 --- a/db/src/test/kotlin/edu/wpi/axon/db/JobDbTest.kt +++ b/db/src/test/kotlin/edu/wpi/inndie/db/JobDbTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.db +package edu.wpi.inndie.db -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.db.data.nextJob +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.db.data.nextJob import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotlintest.matchers.collections.shouldHaveSize diff --git a/db/src/test/kotlin/edu/wpi/axon/db/data/TrainingScriptProgressTest.kt b/db/src/test/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgressTest.kt similarity index 87% rename from db/src/test/kotlin/edu/wpi/axon/db/data/TrainingScriptProgressTest.kt rename to db/src/test/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgressTest.kt index f041c525..1e439304 100644 --- a/db/src/test/kotlin/edu/wpi/axon/db/data/TrainingScriptProgressTest.kt +++ b/db/src/test/kotlin/edu/wpi/inndie/db/data/TrainingScriptProgressTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.db.data +package edu.wpi.inndie.db.data import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest @@ -9,7 +9,9 @@ internal class TrainingScriptProgressTest { @ParameterizedTest @MethodSource("testSerializationSource") fun `test serialize`(progress: TrainingScriptProgress) { - TrainingScriptProgress.deserialize(progress.serialize()).shouldBe(progress) + TrainingScriptProgress.deserialize( + progress.serialize() + ).shouldBe(progress) } companion object { diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Code.kt similarity index 88% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Code.kt index 88642248..e81051b3 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Code.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Code.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable typealias AnyCode = Code> diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Configurable.kt similarity index 88% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Configurable.kt index 5a762cef..1a4cde39 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/Configurable.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/Configurable.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl /** * A "typeclass" for anything that can be configured. diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/UniqueVariableNameGenerator.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/UniqueVariableNameGenerator.kt similarity index 88% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/UniqueVariableNameGenerator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/UniqueVariableNameGenerator.kt index 6fb2d333..281e285a 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/UniqueVariableNameGenerator.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/UniqueVariableNameGenerator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl /** * Generates unique variables names (unique to this instance). diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainer.kt similarity index 95% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainer.kt index 6f54e037..5a9c43ec 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainer.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainer.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.container +package edu.wpi.inndie.dsl.container import kotlin.reflect.KClass diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/Import.kt similarity index 71% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/Import.kt index b7d30c07..a52150ec 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/Import.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/Import.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.imports +package edu.wpi.inndie.dsl.imports import arrow.core.Some -import edu.wpi.axon.patternmatch.Variable -import edu.wpi.axon.patternmatch.match +import edu.wpi.inndie.patternmatch.Variable +import edu.wpi.inndie.patternmatch.match /** * An import statement. @@ -46,20 +46,39 @@ sealed class Import(val components: Set) { fun makeImport(import: String): Import { val components = import.split(Regex("\\s")) return (when (components.size) { - 2, 4, 6 -> match, String, Import>(components) { + 2, 4, 6 -> match, String, Import>( + components + ) { pattern("import", Variable) returns { Import.ModuleOnly(firstMatch()) } - pattern("from", Variable, "import", Variable) returns { + pattern( + "from", + Variable, + "import", + Variable + ) returns { Import.ModuleAndIdentifier(firstMatch(), secondMatch()) } - pattern("import", Variable, "as", Variable) returns { + pattern( + "import", + Variable, + "as", + Variable + ) returns { Import.ModuleAndName(firstMatch(), secondMatch()) } - pattern("from", Variable, "import", Variable, "as", Variable) returns { + pattern( + "from", + Variable, + "import", + Variable, + "as", + Variable + ) returns { Import.FullImport(firstMatch(), secondMatch(), thirdMatch()) } } diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/ImportValidator.kt similarity index 92% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/ImportValidator.kt index c81c766d..048bcfd3 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/imports/ImportValidator.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/imports/ImportValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.imports +package edu.wpi.inndie.dsl.imports import arrow.core.Nel import arrow.core.Validated diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/task/Task.kt similarity index 80% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/task/Task.kt index 2b3df57d..a613d407 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/task/Task.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/task/Task.kt @@ -1,14 +1,15 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.AnyCode -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.Configurable +import edu.wpi.inndie.dsl.AnyCode +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.Configurable /** * A [Task] is analogous to a method call. If this [Task] has an(y) output variable(s), it should * assign to them during [Code.code]. */ -interface Task : Configurable, AnyCode { +interface Task : Configurable, + AnyCode { /** * The name of this task. This does now have an impact on the generated code, it is only used to diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/PathValidator.kt similarity index 85% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/PathValidator.kt index 3b957fd7..81febb25 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/path/PathValidator.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/PathValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.path +package edu.wpi.inndie.dsl.validator.path /** * Validates file paths. diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/VariableNameValidator.kt similarity index 84% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/VariableNameValidator.kt index 6815afad..37d8f64d 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/VariableNameValidator.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/VariableNameValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.variablename +package edu.wpi.inndie.dsl.validator.variablename /** * Validates variable names. diff --git a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/variable/Variable.kt similarity index 81% rename from dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt rename to dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/variable/Variable.kt index 1485fd20..4204ad8d 100644 --- a/dsl-interface/src/main/kotlin/edu/wpi/axon/dsl/variable/Variable.kt +++ b/dsl-interface/src/main/kotlin/edu/wpi/inndie/dsl/variable/Variable.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.variable +package edu.wpi.inndie.dsl.variable -import edu.wpi.axon.dsl.Configurable -import edu.wpi.axon.dsl.validator.variablename.VariableNameValidator +import edu.wpi.inndie.dsl.Configurable +import edu.wpi.inndie.dsl.validator.variablename.VariableNameValidator import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt b/dsl-interface/src/test/kotlin/edu/wpi/inndie/dsl/ImportTest.kt similarity index 90% rename from dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt rename to dsl-interface/src/test/kotlin/edu/wpi/inndie/dsl/ImportTest.kt index cb989d89..65e84f8f 100644 --- a/dsl-interface/src/test/kotlin/edu/wpi/axon/dsl/ImportTest.kt +++ b/dsl-interface/src/test/kotlin/edu/wpi/inndie/dsl/ImportTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport import io.kotlintest.shouldBe import io.kotlintest.shouldThrow import org.junit.jupiter.api.Test diff --git a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockTask.kt similarity index 82% rename from dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockTask.kt index 46a870cb..5b33e30a 100644 --- a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockTask.kt +++ b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockTask.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable import java.util.concurrent.CountDownLatch data class MockTask(override val name: String) : Task { diff --git a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockUtil.kt similarity index 84% rename from dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockUtil.kt index 70ed6749..94e6a550 100644 --- a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockUtil.kt +++ b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockUtil.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.validator.variablename.VariableNameValidator -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.validator.variablename.VariableNameValidator +import edu.wpi.inndie.dsl.variable.Variable import io.mockk.every import io.mockk.mockk diff --git a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockVariable.kt similarity index 59% rename from dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockVariable.kt index ebe8523b..525ffc6a 100644 --- a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/MockVariable.kt +++ b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/MockVariable.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.variable.Variable class MockVariable(name: String) : Variable(name) { diff --git a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TaskConfigurationTestFixture.kt b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TaskConfigurationTestFixture.kt similarity index 94% rename from dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TaskConfigurationTestFixture.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TaskConfigurationTestFixture.kt index 82d173a7..567fdb4e 100644 --- a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TaskConfigurationTestFixture.kt +++ b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TaskConfigurationTestFixture.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.shouldThrow import kotlin.reflect.KClass diff --git a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TestUtil.kt similarity index 87% rename from dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt rename to dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TestUtil.kt index ab32e067..31b71430 100644 --- a/dsl-test-util/src/main/kotlin/edu/wpi/axon/dsl/TestUtil.kt +++ b/dsl-test-util/src/main/kotlin/edu/wpi/inndie/dsl/TestUtil.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import arrow.core.Valid -import edu.wpi.axon.dsl.imports.ImportValidator -import edu.wpi.axon.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.imports.ImportValidator +import edu.wpi.inndie.dsl.validator.path.PathValidator import io.mockk.every import io.mockk.mockk import org.koin.core.module.Module diff --git a/dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/MockUtilTest.kt b/dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/MockUtilTest.kt similarity index 96% rename from dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/MockUtilTest.kt rename to dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/MockUtilTest.kt index 04a40a6a..5a1a1159 100644 --- a/dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/MockUtilTest.kt +++ b/dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/MockUtilTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.variable.Variable import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/TestUtilTest.kt b/dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/TestUtilTest.kt similarity index 97% rename from dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/TestUtilTest.kt rename to dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/TestUtilTest.kt index 458f7d09..d1fb7ae8 100644 --- a/dsl-test-util/src/test/kotlin/edu/wpi/axon/dsl/TestUtilTest.kt +++ b/dsl-test-util/src/test/kotlin/edu/wpi/inndie/dsl/TestUtilTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import io.kotlintest.shouldBe import java.util.concurrent.CountDownLatch diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/BackendKoinModules.kt b/dsl/src/main/kotlin/edu/wpi/axon/dsl/BackendKoinModules.kt deleted file mode 100644 index 7a997669..00000000 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/BackendKoinModules.kt +++ /dev/null @@ -1,28 +0,0 @@ -package edu.wpi.axon.dsl - -import edu.wpi.axon.dsl.imports.DefaultImportValidator -import edu.wpi.axon.dsl.imports.ImportValidator -import edu.wpi.axon.dsl.validator.path.DefaultPathValidator -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.validator.variablename.PythonVariableNameValidator -import edu.wpi.axon.dsl.validator.variablename.VariableNameValidator -import edu.wpi.axon.tfdata.code.DefaultExampleDatasetToCode -import edu.wpi.axon.tfdata.code.ExampleDatasetToCode -import edu.wpi.axon.tfdata.code.layer.DefaultLayerToCode -import edu.wpi.axon.tfdata.code.layer.LayerToCode -import edu.wpi.axon.tfdata.code.loss.DefaultLossToCode -import edu.wpi.axon.tfdata.code.loss.LossToCode -import edu.wpi.axon.tfdata.code.optimizer.DefaultOptimizerToCode -import edu.wpi.axon.tfdata.code.optimizer.OptimizerToCode -import org.koin.dsl.module - -fun defaultBackendModule() = module { - single { PythonVariableNameValidator() } - single { DefaultPathValidator() } - single { DefaultImportValidator() } - single { DefaultUniqueVariableNameGenerator() } - single { DefaultLayerToCode() } - single { DefaultOptimizerToCode() } - single { DefaultLossToCode() } - single { DefaultExampleDatasetToCode() } -} diff --git a/dsl/src/main/kotlin/edu/wpi/inndie/dsl/BackendKoinModules.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/BackendKoinModules.kt new file mode 100644 index 00000000..6132d592 --- /dev/null +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/BackendKoinModules.kt @@ -0,0 +1,28 @@ +package edu.wpi.inndie.dsl + +import edu.wpi.inndie.dsl.imports.DefaultImportValidator +import edu.wpi.inndie.dsl.imports.ImportValidator +import edu.wpi.inndie.dsl.validator.path.DefaultPathValidator +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.validator.variablename.PythonVariableNameValidator +import edu.wpi.inndie.dsl.validator.variablename.VariableNameValidator +import edu.wpi.inndie.tfdata.code.DefaultExampleDatasetToCode +import edu.wpi.inndie.tfdata.code.ExampleDatasetToCode +import edu.wpi.inndie.tfdata.code.layer.DefaultLayerToCode +import edu.wpi.inndie.tfdata.code.layer.LayerToCode +import edu.wpi.inndie.tfdata.code.loss.DefaultLossToCode +import edu.wpi.inndie.tfdata.code.loss.LossToCode +import edu.wpi.inndie.tfdata.code.optimizer.DefaultOptimizerToCode +import edu.wpi.inndie.tfdata.code.optimizer.OptimizerToCode +import org.koin.dsl.module + +fun defaultBackendModule() = module { + single { PythonVariableNameValidator() } + single { DefaultPathValidator() } + single { DefaultImportValidator() } + single { DefaultUniqueVariableNameGenerator() } + single { DefaultLayerToCode() } + single { DefaultOptimizerToCode() } + single { DefaultLossToCode() } + single { DefaultExampleDatasetToCode() } +} diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/CodeGraph.kt similarity index 94% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/CodeGraph.kt index 2904b28a..50e70959 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/CodeGraph.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/CodeGraph.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import arrow.Kind2 import arrow.core.Either @@ -13,10 +13,10 @@ import arrow.core.k import com.google.common.graph.GraphBuilder import com.google.common.graph.ImmutableGraph import com.google.common.graph.MutableGraph -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainer -import edu.wpi.axon.util.anyIn -import edu.wpi.axon.util.checkIslands -import edu.wpi.axon.util.hasCircuits +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.util.anyIn +import edu.wpi.inndie.util.checkIslands +import edu.wpi.inndie.util.hasCircuits /** * Parses a [PolymorphicNamedDomainObjectContainer] of [Code] into an [ImmutableGraph], assuring diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGenerator.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGenerator.kt similarity index 65% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGenerator.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGenerator.kt index 0d150655..cd55dfa2 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGenerator.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGenerator.kt @@ -1,9 +1,10 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl /** * Returns variable names like `var1`, `var2`, etc. with synchronized access. */ -class DefaultUniqueVariableNameGenerator : UniqueVariableNameGenerator { +class DefaultUniqueVariableNameGenerator : + UniqueVariableNameGenerator { private var count = 1 diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/PolymorphicNamedDomainObjectContainerUtil.kt similarity index 86% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/PolymorphicNamedDomainObjectContainerUtil.kt index fdcee4fc..dc2994a3 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/PolymorphicNamedDomainObjectContainerUtil.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/PolymorphicNamedDomainObjectContainerUtil.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainerDelegateProvider -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainerDelegateProvider +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable import kotlin.reflect.KClass /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/ScriptGenerator.kt similarity index 96% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/ScriptGenerator.kt index 0ce5dabe..3907bc84 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/ScriptGenerator.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/ScriptGenerator.kt @@ -1,6 +1,6 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import arrow.core.Either import arrow.core.Invalid @@ -9,13 +9,13 @@ import arrow.core.ValidatedNel import arrow.core.invalidNel import arrow.core.valid import com.google.common.graph.ImmutableGraph -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.task.EmptyBaseTask -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign -import joinWithIndent +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.task.EmptyBaseTask +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.logging.joinWithIndent +import edu.wpi.inndie.util.singleAssign import mu.KotlinLogging /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt similarity index 97% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt index 94fdb96d..a56d0e73 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainer.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.container +package edu.wpi.inndie.dsl.container import kotlin.reflect.KClass import kotlin.reflect.full.createType diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DslDelegate.kt similarity index 91% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DslDelegate.kt index 47eed6f7..89a2fc87 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/DslDelegate.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/DslDelegate.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.container +package edu.wpi.inndie.dsl.container import kotlin.reflect.KProperty diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt similarity index 94% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt index 3cff7764..06ecec6a 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/container/PolymorphicNamedDomainObjectContainerDelegateProvider.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.container +package edu.wpi.inndie.dsl.container -import edu.wpi.axon.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator import kotlin.reflect.KClass import kotlin.reflect.KProperty import org.koin.core.KoinComponent diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidator.kt similarity index 94% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidator.kt index 4f8dc0ad..68b3ffd4 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidator.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.imports +package edu.wpi.inndie.dsl.imports import arrow.core.Invalid import arrow.core.Nel diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTask.kt similarity index 94% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTask.kt index 138f3fd3..08536172 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTask.kt @@ -1,18 +1,18 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.Either import arrow.core.extensions.either.monadError.monadError import arrow.core.extensions.fx -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.code.layer.LayerToCode -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tflayerloader.layerGraphIsValid -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.code.layer.LayerToCode +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tflayerloader.layerGraphIsValid +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject import org.octogonapus.ktguava.collections.toImmutableList diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTask.kt similarity index 88% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTask.kt index c75532c1..07bf09b9 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTask.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.code.layer.LayerToCode -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.util.singleAssign +package edu.wpi.inndie.dsl.task + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.code.layer.LayerToCode +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/BaseTask.kt similarity index 87% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/BaseTask.kt index 27c9c7e7..2edf2572 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/BaseTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/BaseTask.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.Valid -import edu.wpi.axon.dsl.imports.ImportValidator +import edu.wpi.inndie.dsl.imports.ImportValidator import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTask.kt similarity index 80% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTask.kt index a545ccf6..c260ac64 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTask.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.dsl.task - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.util.singleAssign +package edu.wpi.inndie.dsl.task + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.util.singleAssign class CSVLoggerCallbackTask(name: String) : BaseTask(name) { diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTask.kt similarity index 87% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTask.kt index 19fbe084..2bc5d5fb 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTask.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.ModelCheckpointSaveFrequency -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.util.singleAssign +package edu.wpi.inndie.dsl.task + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.ModelCheckpointSaveFrequency +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.util.singleAssign /** * Makes a new `ModelCheckpoint` callback. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CompileModelTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CompileModelTask.kt similarity index 73% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CompileModelTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CompileModelTask.kt index c41d7bef..7948bbf7 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/CompileModelTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/CompileModelTask.kt @@ -1,14 +1,14 @@ -package edu.wpi.axon.dsl.task - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.code.loss.LossToCode -import edu.wpi.axon.tfdata.code.optimizer.OptimizerToCode -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.util.singleAssign +package edu.wpi.inndie.dsl.task + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.code.loss.LossToCode +import edu.wpi.inndie.tfdata.code.optimizer.OptimizerToCode +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ConvertSuperviselyDatasetToRecord.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ConvertSuperviselyDatasetToRecord.kt similarity index 93% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ConvertSuperviselyDatasetToRecord.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ConvertSuperviselyDatasetToRecord.kt index 4e19a79b..37c5d7a9 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/ConvertSuperviselyDatasetToRecord.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/ConvertSuperviselyDatasetToRecord.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTask.kt similarity index 87% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTask.kt index d22a8afb..4ad3413d 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTask.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.util.singleAssign class EarlyStoppingTask(name: String) : BaseTask(name) { diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EmptyBaseTask.kt similarity index 70% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EmptyBaseTask.kt index 142377f3..64411b3e 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EmptyBaseTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EmptyBaseTask.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable data class EmptyBaseTask(override val name: String) : BaseTask(name) { override val imports: MutableSet = mutableSetOf() diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTask.kt similarity index 70% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTask.kt index 2f272b3f..f02625a8 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable /** * Enables TensorFlow's eager execution mode. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerDeltaUtil.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerDeltaUtil.kt similarity index 92% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerDeltaUtil.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerDeltaUtil.kt index 6a113d4f..b1c12b71 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerDeltaUtil.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerDeltaUtil.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.tfdata.layer.Layer /** * Determines the layer operations to transform [oldLayers] into [newLayers]. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerOperation.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerOperation.kt similarity index 84% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerOperation.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerOperation.kt index fdb41397..fa5f2559 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LayerOperation.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LayerOperation.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer internal sealed class LayerOperation(open val layer: Layer.MetaLayer) { diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabels.kt similarity index 82% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabels.kt index 9ed3da80..08937357 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadClassLabels.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabels.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTask.kt similarity index 80% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTask.kt index 9aac30a3..e74e9c2f 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTask.kt @@ -1,13 +1,13 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.code.ExampleDatasetToCode -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.code.ExampleDatasetToCode +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadImageTask.kt similarity index 80% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadImageTask.kt index 222160b1..c48fa256 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadImageTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadImageTask.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadModelTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadModelTask.kt similarity index 80% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadModelTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadModelTask.kt index 49af1d08..44a2145f 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadModelTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadModelTask.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadStringTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadStringTask.kt similarity index 77% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadStringTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadStringTask.kt index 983b01e1..2425260d 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadStringTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadStringTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign /** * Puts a string into a variable. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjects.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjects.kt similarity index 93% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjects.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjects.kt index 26e3250f..559520a7 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjects.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjects.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTask.kt similarity index 88% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTask.kt index 1f238262..83d01262 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTask.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTask.kt similarity index 85% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTask.kt index a65ee83b..5ad2f283 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTask.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.dsl.task - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.validator.path.PathValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +package edu.wpi.inndie.dsl.task + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.validator.path.PathValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject /** diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunInferenceTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTask.kt similarity index 83% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunInferenceTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTask.kt index 1aa62cc9..46728e49 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunInferenceTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign /** * Runs inference. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunPluginTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunPluginTask.kt similarity index 90% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunPluginTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunPluginTask.kt index 882047a6..0ee6917c 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/RunPluginTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/RunPluginTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign /** * Runs a plugin by emitting its definition, calling it with some input variables, and saving its diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTask.kt similarity index 76% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTask.kt index 263e15e3..6f81c0a2 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTask.kt @@ -1,14 +1,14 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.Option import arrow.core.Some -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.UniqueVariableNameGenerator -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.axonBucketName -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.UniqueVariableNameGenerator +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.inndieBucketName +import edu.wpi.inndie.util.singleAssign import org.koin.core.inject import org.koin.core.qualifier.named @@ -34,7 +34,7 @@ class S3ProgressReportingCallbackTask(name: String) : BaseTask(name) { override val imports: Set = setOf( makeImport("import tensorflow as tf"), - makeImport("import axon.client"), + makeImport("import inndie.client"), makeImport("import os.path") ) @@ -48,7 +48,7 @@ class S3ProgressReportingCallbackTask(name: String) : BaseTask(name) { /** * The name of the S3 bucket to upload the progress to. */ - private val bucketName: Option by inject(named(axonBucketName)) + private val bucketName: Option by inject(named(inndieBucketName)) private val variableNameGenerator: UniqueVariableNameGenerator by inject() @@ -61,7 +61,7 @@ class S3ProgressReportingCallbackTask(name: String) : BaseTask(name) { | def on_epoch_end(self, epoch, logs=None): | if os.path.isfile("$csvLogFile"): | with open("$csvLogFile", "r") as f: - | axon.client.impl_update_training_progress($jobId, f.read(), + | inndie.client.impl_update_training_progress($jobId, f.read(), | "${(bucketName as Some).t}", | None) | diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SaveModelTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SaveModelTask.kt similarity index 82% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SaveModelTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SaveModelTask.kt index c95aa9ab..9ac18a01 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SaveModelTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SaveModelTask.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.makeImport -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.makeImport +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign /** * Saves a model to disk. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SliceTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SliceTask.kt similarity index 77% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SliceTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SliceTask.kt index 1e83c87a..0a544a4f 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/SliceTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/SliceTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.util.singleAssign /** * Inserts Python's slice notation to slice the [input]. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/TrainTask.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/TrainTask.kt similarity index 92% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/task/TrainTask.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/TrainTask.kt index a0438efa..cc25ade0 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/task/TrainTask.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/task/TrainTask.kt @@ -1,15 +1,15 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.None import arrow.core.Option import arrow.core.extensions.fx import arrow.core.getOrElse -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Verbosity -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Verbosity +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.util.singleAssign /** * Starts training on a model. diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidator.kt similarity index 92% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidator.kt index 159a32ac..40188b00 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidator.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.path +package edu.wpi.inndie.dsl.validator.path import java.nio.file.InvalidPathException import java.nio.file.Paths diff --git a/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidator.kt similarity index 81% rename from dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt rename to dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidator.kt index 4605136d..8e1a36dd 100644 --- a/dsl/src/main/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidator.kt +++ b/dsl/src/main/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidator.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.variablename +package edu.wpi.inndie.dsl.validator.variablename class PythonVariableNameValidator : VariableNameValidator { diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/CodeGraphTest.kt similarity index 99% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/CodeGraphTest.kt index d00bed58..bba50178 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/CodeGraphTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/CodeGraphTest.kt @@ -1,6 +1,6 @@ @file:SuppressWarnings("StringLiteralDuplication") -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import com.google.common.graph.EndpointPair import io.kotlintest.assertions.arrow.either.shouldBeLeft diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGeneratorTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGeneratorTest.kt similarity index 97% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGeneratorTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGeneratorTest.kt index 3e46bb87..8c48ebd4 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/DefaultUniqueVariableNameGeneratorTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/DefaultUniqueVariableNameGeneratorTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl import io.kotlintest.shouldBe import java.util.concurrent.CountDownLatch diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/MockContainer.kt similarity index 87% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/MockContainer.kt index 2de0dc40..604b3097 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/MockContainer.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/MockContainer.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainer import kotlin.reflect.KClass import org.junit.jupiter.api.fail diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorIntegrationTest.kt similarity index 96% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorIntegrationTest.kt index f00192d4..31fd8f1d 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorIntegrationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorIntegrationTest.kt @@ -1,12 +1,12 @@ @file:SuppressWarnings("LargeClass") -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.container.DefaultPolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.task.EmptyBaseTask -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.container.DefaultPolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.task.EmptyBaseTask +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.assertions.arrow.nel.shouldHaveSize import io.kotlintest.assertions.arrow.validation.shouldBeInvalid import io.kotlintest.assertions.arrow.validation.shouldBeValid diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorTest.kt similarity index 87% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorTest.kt index 2c31d24d..37801f0a 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/ScriptGeneratorTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/ScriptGeneratorTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl +package edu.wpi.inndie.dsl -import edu.wpi.axon.dsl.container.PolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.container.PolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.testutil.KoinTestFixture import io.mockk.confirmVerified import io.mockk.every import io.mockk.mockk diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt similarity index 89% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt index 0ca91fcd..3a6862d1 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/container/DefaultPolymorphicNamedDomainObjectContainerTest.kt @@ -1,15 +1,15 @@ -package edu.wpi.axon.dsl.container - -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.MockVariable -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.dsl.mockVariableNameValidator -import edu.wpi.axon.dsl.runExactlyOnce -import edu.wpi.axon.dsl.task.BaseTask -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.testutil.KoinTestFixture +package edu.wpi.inndie.dsl.container + +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.MockVariable +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.dsl.mockVariableNameValidator +import edu.wpi.inndie.dsl.runExactlyOnce +import edu.wpi.inndie.dsl.task.BaseTask +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.matchers.maps.shouldContainExactly import io.kotlintest.matchers.maps.shouldContainKey diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidatorTest.kt similarity index 96% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidatorTest.kt index 12794e6d..cd3c89b2 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/imports/DefaultImportValidatorTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/imports/DefaultImportValidatorTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.imports +package edu.wpi.inndie.dsl.imports import io.kotlintest.assertions.arrow.validation.shouldBeInvalid import io.kotlintest.assertions.arrow.validation.shouldBeValid diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt similarity index 77% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt index 5d520305..d2bf810d 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class ApplyFunctionalLayerDeltaConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt similarity index 98% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt index b712a934..89c0fba1 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplyFunctionalLayerDeltaTaskTest.kt @@ -1,6 +1,6 @@ @file:SuppressWarnings("LongMethod", "LargeClass", "TooManyFunctions") -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.Either import arrow.core.extensions.either.monadError.monadError @@ -9,15 +9,15 @@ import arrow.core.left import arrow.core.right import com.google.common.graph.GraphBuilder import com.google.common.graph.ImmutableGraph -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.code.layer.LayerToCode -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tflayerloader.layerGraphIsValid +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.code.layer.LayerToCode +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tflayerloader.layerGraphIsValid import io.kotlintest.assertions.arrow.either.shouldBeRight import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.matchers.ints.shouldBeGreaterThanOrEqual diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt similarity index 77% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt index 35d72915..c42fc09d 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class ApplySequentialLayerDeltaConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt similarity index 97% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt index d1917d7e..cb6de901 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskIntegrationTest.kt @@ -6,13 +6,13 @@ "SpreadOperator" ) -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskTest.kt similarity index 96% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskTest.kt index fd902ba3..9e1d592c 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/ApplySequentialLayerDeltaTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/ApplySequentialLayerDeltaTaskTest.kt @@ -1,15 +1,15 @@ @file:SuppressWarnings("TooManyFunctions", "StringLiteralDuplication", "LargeClass") -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.right -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.code.layer.LayerToCode -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.code.layer.LayerToCode +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/BaseTaskTest.kt similarity index 85% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/BaseTaskTest.kt index 72c60756..4265007c 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/BaseTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/BaseTaskTest.kt @@ -1,14 +1,14 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.Invalid import arrow.core.Nel -import edu.wpi.axon.dsl.Code -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredIncorrectly -import edu.wpi.axon.dsl.imports.Import -import edu.wpi.axon.dsl.imports.ImportValidator -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.Code +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredIncorrectly +import edu.wpi.inndie.dsl.imports.Import +import edu.wpi.inndie.dsl.imports.ImportValidator +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.mockk.every import io.mockk.mockk diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt similarity index 69% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt index 38936f4d..a7939b95 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture class CSVLoggerCallbackTaskConfigurationTest : TaskConfigurationTestFixture( CSVLoggerCallbackTask::class, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskTest.kt similarity index 88% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskTest.kt index 7a070942..9b72d898 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CSVLoggerCallbackTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CSVLoggerCallbackTaskTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskConfigurationTest.kt similarity index 74% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskConfigurationTest.kt index f99a82ed..94c57551 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class CheckpointCallbackTaskConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskTest.kt similarity index 88% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskTest.kt index d2cf4c73..ee7647b0 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CheckpointCallbackTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CheckpointCallbackTaskTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.ModelCheckpointSaveFrequency +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.ModelCheckpointSaveFrequency import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelConfigurationTest.kt similarity index 67% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelConfigurationTest.kt index e5500488..191c8516 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class CompileModelConfigurationTest : TaskConfigurationTestFixture( CompileModelTask::class, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskIntegrationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskIntegrationTest.kt similarity index 78% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskIntegrationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskIntegrationTest.kt index c7e58310..63392308 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskIntegrationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskIntegrationTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskTest.kt similarity index 89% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskTest.kt index 873771f0..294143b0 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/CompileModelTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/CompileModelTaskTest.kt @@ -1,13 +1,13 @@ @file:SuppressWarnings("LongMethod", "LargeClass", "TooManyFunctions") -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.code.loss.LossToCode -import edu.wpi.axon.tfdata.code.optimizer.OptimizerToCode -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.code.loss.LossToCode +import edu.wpi.inndie.tfdata.code.optimizer.OptimizerToCode +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer import io.kotlintest.shouldBe import io.mockk.confirmVerified import io.mockk.every diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskConfigurationTest.kt similarity index 66% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskConfigurationTest.kt index 0306823e..bd49c17e 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class EarlyStoppingTaskConfigurationTest : TaskConfigurationTestFixture( EarlyStoppingTask::class, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskTest.kt similarity index 87% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskTest.kt index cd3b34fc..fccd50c1 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EarlyStoppingTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EarlyStoppingTaskTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTaskTest.kt similarity index 79% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTaskTest.kt index e5f351c4..92574b02 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/EnableEagerExecutionTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/EnableEagerExecutionTaskTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsConfigurationTest.kt similarity index 71% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsConfigurationTest.kt index f3ace5be..f017e5a1 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class LoadClassLabelsConfigurationTest : TaskConfigurationTestFixture( { LoadClassLabels("").apply { classLabelsPath = "" } }, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsTest.kt similarity index 80% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsTest.kt index e5fb68ab..4de6e691 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadClassLabelsTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadClassLabelsTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysInvalidPathValidator -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.alwaysValidPathValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysInvalidPathValidator +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.alwaysValidPathValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt similarity index 81% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt index a672312c..3850a087 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class LoadExampleDatasetTaskConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskTest.kt similarity index 84% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskTest.kt index 4b1e7cbb..eeca5db0 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadExampleDatasetTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadExampleDatasetTaskTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.code.ExampleDatasetToCode +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.code.ExampleDatasetToCode import io.kotlintest.shouldBe import io.mockk.confirmVerified import io.mockk.every diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskConfigurationTest.kt similarity index 69% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskConfigurationTest.kt index da70355e..7a12276e 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class LoadImageTaskConfigurationTest : TaskConfigurationTestFixture( { LoadImageTask("").apply { imagePath = "" } }, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskTest.kt similarity index 79% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskTest.kt index f73d14b5..40155c18 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadImageTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadImageTaskTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysInvalidPathValidator -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.alwaysValidPathValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysInvalidPathValidator +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.alwaysValidPathValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskConfigurationTest.kt similarity index 69% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskConfigurationTest.kt index 7b29964b..7529e022 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class LoadModelTaskConfigurationTest : TaskConfigurationTestFixture( { LoadModelTask("").apply { modelPath = "" } }, diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskTest.kt similarity index 77% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskTest.kt index e970b605..76f468f8 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadModelTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadModelTaskTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysValidPathValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysValidPathValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskConfigurationTest.kt similarity index 71% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskConfigurationTest.kt index dc9aae44..36ce0ad3 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class LoadStringTaskConfigurationTest : TaskConfigurationTestFixture( { diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskTest.kt similarity index 84% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskTest.kt index 7eaec4d4..b0be3986 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadStringTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadStringTaskTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt similarity index 73% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt index 663a6e1b..a9512fb2 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/LoadTFRecordOfImagesWithObjectsConfigurationTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.FilePath internal class LoadTFRecordOfImagesWithObjectsConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt similarity index 82% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt index be99b5eb..9c8624d1 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class PostTrainingQuantizationTaskConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskTest.kt similarity index 90% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskTest.kt index 4733632a..f3e52c74 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/PostTrainingQuantizationTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/PostTrainingQuantizationTaskTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.alwaysValidPathValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.alwaysValidPathValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt similarity index 75% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt index d024ea5f..f5b1461f 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class RunEdgeTpuCompilerTaskConfigurationTest : TaskConfigurationTestFixture( diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskTest.kt similarity index 90% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskTest.kt index a20aebdb..d3d4041e 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunEdgeTpuCompilerTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunEdgeTpuCompilerTaskTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.alwaysValidPathValidator -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.alwaysValidPathValidator +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskConfigurationTest.kt similarity index 77% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskConfigurationTest.kt index 6fa8d3dc..f758bb06 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class RunInferenceTaskConfigurationTest : TaskConfigurationTestFixture( { diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskTest.kt similarity index 82% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskTest.kt index b49b5ffb..c1b4223c 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunInferenceTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunInferenceTaskTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunPluginTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunPluginTaskTest.kt similarity index 92% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunPluginTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunPluginTaskTest.kt index 5142462d..df341ade 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/RunPluginTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/RunPluginTaskTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.configuredIncorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.configuredIncorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTaskTest.kt similarity index 78% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTaskTest.kt index 7ffa4295..9e15f975 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/S3ProgressReportingCallbackTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/S3ProgressReportingCallbackTaskTest.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.dsl.mockVariableNameGenerator -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.util.axonBucketName +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.dsl.mockVariableNameGenerator +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.util.inndieBucketName import io.kotlintest.shouldBe import kotlin.random.Random import org.junit.Test @@ -31,7 +31,7 @@ internal class S3ProgressReportingCallbackTaskTest : KoinTestFixture() { fun `test code gen`() { startKoin { modules(module { - single(named(axonBucketName)) { "b" } + single(named(inndieBucketName)) { "b" } mockVariableNameGenerator() }) } @@ -48,7 +48,7 @@ internal class S3ProgressReportingCallbackTaskTest : KoinTestFixture() { | def on_epoch_end(self, epoch, logs=None): | if os.path.isfile("./output/logFile.csv"): | with open("./output/logFile.csv", "r") as f: - | axon.client.impl_update_training_progress(${task.jobId}, f.read(), + | inndie.client.impl_update_training_progress(${task.jobId}, f.read(), | "b", | None) | diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SaveModelTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SaveModelTaskTest.kt similarity index 83% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SaveModelTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SaveModelTaskTest.kt index bb8a03c2..d1458b2f 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SaveModelTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SaveModelTaskTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskConfigurationTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskConfigurationTest.kt similarity index 71% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskConfigurationTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskConfigurationTest.kt index 45991581..16217ad9 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskConfigurationTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskConfigurationTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture internal class SliceTaskConfigurationTest : TaskConfigurationTestFixture( { diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskTest.kt similarity index 78% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskTest.kt index 07b9f17a..6c83b198 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/SliceTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/SliceTaskTest.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.koin.core.context.startKoin diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/TrainTaskTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/TrainTaskTest.kt similarity index 95% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/task/TrainTaskTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/TrainTaskTest.kt index 45ac5b10..24669e2d 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/task/TrainTaskTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/task/TrainTaskTest.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.dsl.task +package edu.wpi.inndie.dsl.task import arrow.core.None import arrow.core.Some -import edu.wpi.axon.dsl.TaskConfigurationTestFixture -import edu.wpi.axon.dsl.alwaysValidImportValidator -import edu.wpi.axon.dsl.configuredCorrectly -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Verbosity +import edu.wpi.inndie.dsl.TaskConfigurationTestFixture +import edu.wpi.inndie.dsl.alwaysValidImportValidator +import edu.wpi.inndie.dsl.configuredCorrectly +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Verbosity import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.shouldBe diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidatorTest.kt similarity index 96% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidatorTest.kt index aee4a777..8c0f3d09 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/path/DefaultPathValidatorTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/path/DefaultPathValidatorTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.path +package edu.wpi.inndie.dsl.validator.path import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue diff --git a/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidatorTest.kt similarity index 96% rename from dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt rename to dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidatorTest.kt index 7bd40530..62c3a597 100644 --- a/dsl/src/test/kotlin/edu/wpi/axon/dsl/validator/variablename/PythonVariableNameValidatorTest.kt +++ b/dsl/src/test/kotlin/edu/wpi/inndie/dsl/validator/variablename/PythonVariableNameValidatorTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.dsl.validator.variablename +package edu.wpi.inndie.dsl.validator.variablename import com.natpryce.hamkrest.assertion.assertThat import com.natpryce.hamkrest.equalTo diff --git a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModel.kt b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModel.kt similarity index 80% rename from example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModel.kt rename to example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModel.kt index dad6ad6e..3949668d 100644 --- a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModel.kt +++ b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModel.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.examplemodel +package edu.wpi.inndie.examplemodel -import edu.wpi.axon.tfdata.SerializableOptionB +import edu.wpi.inndie.tfdata.SerializableOptionB import kotlinx.serialization.Serializable /** - * One of the models that Axon supports out of the box. + * One of the models that INNDiE supports out of the box. */ @Serializable data class ExampleModel( diff --git a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelManager.kt b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelManager.kt similarity index 93% rename from example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelManager.kt rename to example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelManager.kt index 23d008b7..b57818bd 100644 --- a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelManager.kt +++ b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelManager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.examplemodel +package edu.wpi.inndie.examplemodel import arrow.core.None import arrow.core.Some @@ -6,9 +6,9 @@ import arrow.core.Tuple2 import arrow.core.toT import arrow.fx.IO import arrow.fx.extensions.fx -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tflayerloader.ModelLoaderFactory +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tflayerloader.ModelLoaderFactory import java.io.File import org.octogonapus.ktguava.collections.mapNodes diff --git a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelsMetadata.kt b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelsMetadata.kt similarity index 94% rename from example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelsMetadata.kt rename to example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelsMetadata.kt index 0d608372..e4c11137 100644 --- a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/ExampleModelsMetadata.kt +++ b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/ExampleModelsMetadata.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.examplemodel +package edu.wpi.inndie.examplemodel import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManager.kt b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManager.kt similarity index 87% rename from example-models/src/main/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManager.kt rename to example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManager.kt index aa297135..4c515b24 100644 --- a/example-models/src/main/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManager.kt +++ b/example-models/src/main/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManager.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.examplemodel +package edu.wpi.inndie.examplemodel import arrow.fx.IO -import edu.wpi.axon.util.localCacheDir +import edu.wpi.inndie.util.localCacheDir import java.io.File import java.net.URL import org.apache.commons.io.FileUtils @@ -27,7 +27,7 @@ class GitExampleModelManager : ExampleModelManager { * The URL to download the example models metadata from. */ var exampleModelMetadataUrl = - "https://raw.githubusercontent.com/wpilibsuite/axon-example-models/master/exampleModels.json" + "https://raw.githubusercontent.com/wpilibsuite/inndie-example-models/master/exampleModels.json" override fun getAllExampleModels(): IO> = IO { check(exampleModelMetadataFile.exists()) { @@ -35,7 +35,9 @@ class GitExampleModelManager : ExampleModelManager { "disk. Try updating the cache." } - ExampleModelsMetadata.deserialize(exampleModelMetadataFile.readText()).exampleModels + ExampleModelsMetadata.deserialize( + exampleModelMetadataFile.readText() + ).exampleModels } @Suppress("BlockingMethodInNonBlockingContext") diff --git a/example-models/src/test/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManagerTest.kt b/example-models/src/test/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManagerTest.kt similarity index 97% rename from example-models/src/test/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManagerTest.kt rename to example-models/src/test/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManagerTest.kt index 475d0c44..70163108 100644 --- a/example-models/src/test/kotlin/edu/wpi/axon/examplemodel/GitExampleModelManagerTest.kt +++ b/example-models/src/test/kotlin/edu/wpi/inndie/examplemodel/GitExampleModelManagerTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.examplemodel +package edu.wpi.inndie.examplemodel import arrow.core.None import arrow.core.Some -import edu.wpi.axon.tfdata.SerializableOptionB +import edu.wpi.inndie.tfdata.SerializableOptionB import io.kotlintest.assertions.arrow.either.shouldBeLeft import io.kotlintest.matchers.collections.shouldContain import io.kotlintest.matchers.collections.shouldContainExactly @@ -16,7 +16,7 @@ import org.junit.jupiter.api.io.TempDir internal class GitExampleModelManagerTest { private val testExampleModelMetadataUrl = - "https://raw.githubusercontent.com/wpilibsuite/axon-example-models-testing/master/exampleModels.json" + "https://raw.githubusercontent.com/wpilibsuite/inndie-example-models-testing/master/exampleModels.json" @Test fun `update cache once`(@TempDir tempDir: File) { @@ -56,7 +56,7 @@ internal class GitExampleModelManagerTest { ExampleModel( "Model 1", "model1.h5", - "https://raw.githubusercontent.com/wpilibsuite/axon-example-models-testing/master/models/model1.h5", + "https://raw.githubusercontent.com/wpilibsuite/inndie-example-models-testing/master/models/model1.h5", "The first model.", mapOf( "input_1" to None, @@ -66,7 +66,7 @@ internal class GitExampleModelManagerTest { ExampleModel( "Model 2", "model2.h5", - "https://raw.githubusercontent.com/wpilibsuite/axon-example-models-testing/master/models/model2.h5", + "https://raw.githubusercontent.com/wpilibsuite/inndie-example-models-testing/master/models/model2.h5", "The second model.", mapOf( "input_1" to None, diff --git a/gradle.properties b/gradle.properties index df66a7b4..612fa544 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.caching=true org.gradle.jvmargs=-XX:MaxPermSize=1g -XX:MaxMetaspaceSize=1g kotlin.parallel.tasks.in.project=true -axon.version=0.1.0 +inndie.version=0.1.0 kotlinVersion=1.3.60 gradle-wrapper.version=5.6.4 diff --git a/axon.gradle.kts b/inndie.gradle.kts similarity index 93% rename from axon.gradle.kts rename to inndie.gradle.kts index 6d314227..fc370a46 100644 --- a/axon.gradle.kts +++ b/inndie.gradle.kts @@ -112,7 +112,7 @@ buildscript { } allprojects { - version = property("axon.version") as String + version = property("inndie.version") as String group = "edu.wpi" apply { @@ -197,7 +197,7 @@ configure(javaProjects) { // ) // TODO: Go back to the old dependencies once 4.x.x is out - // https://github.com/wpilibsuite/Axon/issues/84 + // https://github.com/wpilibsuite/INNDiE/issues/84 testImplementation( files( "$rootDir/libraries/kotlintest-runner-junit5-jvm-4.0.2631-SNAPSHOT.jar", @@ -468,7 +468,7 @@ configure(publishedProjects) { plugin("java-library") } - val projectName = "axon" + val projectName = "inndie" task("sourcesJar") { archiveClassifier.set("sources") @@ -496,27 +496,6 @@ configure(publishedProjects) { } } } - - // bintray { - // val bintrayApiUser = properties["bintray.api.user"] ?: System.getenv("BINTRAY_USER") - // val bintrayApiKey = properties["bintray.api.key"] ?: System.getenv("BINTRAY_API_KEY") - // user = bintrayApiUser as String? - // key = bintrayApiKey as String? - // setPublications(publicationName) - // with(pkg) { - // repo = "maven-artifacts" - // name = projectName - // userOrg = "commonwealthrobotics" - // publish = true - // setLicenses("LGPL-3.0") - // vcsUrl = "https://github.com/CommonWealthRobotics/bowler-kernel.git" - // githubRepo = "https://github.com/CommonWealthRobotics/bowler-kernel" - // kotlin.with(version) { - // name = property("axon.version") as String - // desc = "The heart of the Bowler stack." - // } - // } - // } } tasks.dokka { diff --git a/logging/src/main/kotlin/edu.wpi.axon.logging.kt b/logging/src/main/kotlin/edu/wpi/inndie/logging/logging.kt similarity index 91% rename from logging/src/main/kotlin/edu.wpi.axon.logging.kt rename to logging/src/main/kotlin/edu/wpi/inndie/logging/logging.kt index dddad360..712fb2bd 100644 --- a/logging/src/main/kotlin/edu.wpi.axon.logging.kt +++ b/logging/src/main/kotlin/edu/wpi/inndie/logging/logging.kt @@ -1,3 +1,5 @@ +package edu.wpi.inndie.logging + /** * Calls [joinToString] with an indent applied to each separated line. * diff --git a/logging/src/main/resources/log4j.properties b/logging/src/main/resources/log4j.properties index 6eda3050..a6d45367 100644 --- a/logging/src/main/resources/log4j.properties +++ b/logging/src/main/resources/log4j.properties @@ -7,6 +7,6 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %t % log4j.appender.file=org.apache.log4j.rolling.RollingFileAppender log4j.appender.file.RollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy -log4j.appender.file.RollingPolicy.FileNamePattern=${user.home}/.wpilib/Axon/logs/axon_%d{yyyyMMddHHmm}.log +log4j.appender.file.RollingPolicy.FileNamePattern=${user.home}/.wpilib/INNDiE/logs/inndie_%d{yyyyMMddHHmm}.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %t %l%n%m%n diff --git a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/MatchedPremise.kt similarity index 94% rename from pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt rename to pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/MatchedPremise.kt index 24f14b72..08697cde 100644 --- a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/MatchedPremise.kt +++ b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/MatchedPremise.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.patternmatch +package edu.wpi.inndie.patternmatch import arrow.core.Some diff --git a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/Pattern.kt similarity index 96% rename from pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt rename to pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/Pattern.kt index 8f1101fb..3781863c 100644 --- a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/Pattern.kt +++ b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/Pattern.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.patternmatch +package edu.wpi.inndie.patternmatch import arrow.core.None import arrow.core.Option diff --git a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/PatternMatch.kt similarity index 97% rename from pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt rename to pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/PatternMatch.kt index 903112a6..c10ad0b2 100644 --- a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/PatternMatch.kt +++ b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/PatternMatch.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.patternmatch +package edu.wpi.inndie.patternmatch import arrow.core.Option import arrow.core.Some diff --git a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/ReturnValue.kt similarity index 63% rename from pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt rename to pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/ReturnValue.kt index 15d91874..a62282aa 100644 --- a/pattern-match/src/main/kotlin/edu/wpi/axon/patternmatch/ReturnValue.kt +++ b/pattern-match/src/main/kotlin/edu/wpi/inndie/patternmatch/ReturnValue.kt @@ -1,3 +1,3 @@ -package edu.wpi.axon.patternmatch +package edu.wpi.inndie.patternmatch typealias ReturnValue = MatchedPremise.() -> R diff --git a/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt b/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt deleted file mode 100644 index 76d03d64..00000000 --- a/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternMatchTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package edu.wpi.axon.patternmatch - -import io.kotlintest.assertions.arrow.option.shouldBeNone -import io.kotlintest.assertions.arrow.option.shouldBeSome -import org.junit.jupiter.api.Test - -internal class PatternMatchTest { - - @Test - fun `no patterns returns None`() { - match, String, String>(listOf("a", "b")) {}.shouldBeNone() - } - - @Test - fun `no matching patterns returns None`() { - match, String, String>(listOf("a")) { - pattern("b") returns { firstMatch() } - }.shouldBeNone() - } - - @Test - fun `one matching pattern with a variable returns the value of that variable`() { - match, String, String>(listOf("a", "b")) { - pattern("a", Variable) returns { firstMatch() } - }.shouldBeSome("b") - } - - @Test - fun `two matching patterns picks the first pattern`() { - match, String, String>(listOf("a", "b", "c")) { - pattern("a", Variable, Variable) returns { secondMatch() } - pattern("a", Variable, Variable) returns { firstMatch() } - }.shouldBeSome("c") - } -} diff --git a/pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternMatchTest.kt b/pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternMatchTest.kt new file mode 100644 index 00000000..9b40a43d --- /dev/null +++ b/pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternMatchTest.kt @@ -0,0 +1,62 @@ +package edu.wpi.inndie.patternmatch + +import io.kotlintest.assertions.arrow.option.shouldBeNone +import io.kotlintest.assertions.arrow.option.shouldBeSome +import org.junit.jupiter.api.Test + +internal class PatternMatchTest { + + @Test + fun `no patterns returns None`() { + match, String, String>( + listOf( + "a", + "b" + ) + ) {}.shouldBeNone() + } + + @Test + fun `no matching patterns returns None`() { + match, String, String>(listOf("a")) { + pattern("b") returns { firstMatch() } + }.shouldBeNone() + } + + @Test + fun `one matching pattern with a variable returns the value of that variable`() { + match, String, String>( + listOf( + "a", + "b" + ) + ) { + pattern( + "a", + Variable + ) returns { firstMatch() } + }.shouldBeSome("b") + } + + @Test + fun `two matching patterns picks the first pattern`() { + match, String, String>( + listOf( + "a", + "b", + "c" + ) + ) { + pattern( + "a", + Variable, + Variable + ) returns { secondMatch() } + pattern( + "a", + Variable, + Variable + ) returns { firstMatch() } + }.shouldBeSome("c") + } +} diff --git a/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt b/pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternTest.kt similarity index 58% rename from pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt rename to pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternTest.kt index 9a103db7..e879edf8 100644 --- a/pattern-match/src/test/kotlin/edu/wpi/axon/patternmatch/PatternTest.kt +++ b/pattern-match/src/test/kotlin/edu/wpi/inndie/patternmatch/PatternTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.patternmatch +package edu.wpi.inndie.patternmatch import arrow.core.None import arrow.core.Some @@ -9,62 +9,94 @@ internal class PatternTest { @Test fun `match with empty list`() { - val premise = Pattern, String>(emptyList()) + val premise = + Pattern, String>(emptyList()) assertEquals(Some(emptyList()), premise.match(emptyList())) } @Test fun `mismatch with empty list`() { - val premise = Pattern, String>(emptyList()) + val premise = + Pattern, String>(emptyList()) assertEquals(None, premise.match(listOf("val1"))) } @Test fun `match with one value`() { - val premise = Pattern, String>(listOf("val1")) + val premise = + Pattern, String>(listOf("val1")) assertEquals(Some(emptyList()), premise.match(listOf("val1"))) } @Test fun `mismatch with one value`() { - val premise = Pattern, String>(listOf("val1")) + val premise = + Pattern, String>(listOf("val1")) assertEquals(None, premise.match(listOf("val2"))) } @Test fun `match with one var`() { - val premise = Pattern, String>(listOf(Variable)) + val premise = Pattern, String>( + listOf(Variable) + ) assertEquals(Some(listOf("var1")), premise.match(listOf("var1"))) } @Test fun `match with one value and one var`() { - val premise = Pattern, String>(listOf("val1", Variable)) + val premise = Pattern, String>( + listOf( + "val1", + Variable + ) + ) assertEquals(Some(listOf("var1")), premise.match(listOf("val1", "var1"))) } @Test fun `mismatch on head with one value and one var`() { - val premise = Pattern, String>(listOf("val1", Variable)) + val premise = Pattern, String>( + listOf( + "val1", + Variable + ) + ) assertEquals(None, premise.match(listOf("val2", "var1"))) } @Test fun `mismatch on tail with one value and one var`() { - val premise = Pattern, String>(listOf("val1", Variable)) + val premise = Pattern, String>( + listOf( + "val1", + Variable + ) + ) assertEquals(None, premise.match(listOf("var1", "val2"))) } @Test fun `match with one var and one value`() { - val premise = Pattern, String>(listOf(Variable, "val1")) + val premise = Pattern, String>( + listOf( + Variable, + "val1" + ) + ) assertEquals(Some(listOf("var1")), premise.match(listOf("var1", "val1"))) } @Test fun `match with three values and two vars`() { val premise = Pattern, String>( - listOf("val1", Variable, "val2", Variable, "val3") + listOf( + "val1", + Variable, + "val2", + Variable, + "val3" + ) ) assertEquals( @@ -76,7 +108,13 @@ internal class PatternTest { @Test fun `mismatch with three values and two vars`() { val premise = Pattern, String>( - listOf("val1", Variable, "val2", Variable, "val3") + listOf( + "val1", + Variable, + "val2", + Variable, + "val3" + ) ) assertEquals( diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/DatasetPlugins.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/DatasetPlugins.kt similarity index 87% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/DatasetPlugins.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/DatasetPlugins.kt index 726010fd..ff82eb90 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/DatasetPlugins.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/DatasetPlugins.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin object DatasetPlugins { val datasetPassthroughPlugin = Plugin.Official( @@ -29,9 +29,10 @@ object DatasetPlugins { """.trimMargin() ) - val processMnistTypeForMobilenetPlugin = Plugin.Official( - "Process MNIST-type for Mobilenet", - """ + val processMnistTypeForMobilenetPlugin = + Plugin.Official( + "Process MNIST-type for Mobilenet", + """ |def process_dataset(x, y): | newX = tf.cast(x / 255.0, tf.float32) | newX = newX[..., tf.newaxis] @@ -40,5 +41,5 @@ object DatasetPlugins { | newY = tf.keras.utils.to_categorical(y) | return (newX, newY) """.trimMargin() - ) + ) } diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/LoadTestDataPlugins.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/LoadTestDataPlugins.kt similarity index 99% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/LoadTestDataPlugins.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/LoadTestDataPlugins.kt index 64af413d..9422f2fe 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/LoadTestDataPlugins.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/LoadTestDataPlugins.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin object LoadTestDataPlugins { diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/LocalPluginManager.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/LocalPluginManager.kt similarity index 84% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/LocalPluginManager.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/LocalPluginManager.kt index 37c0893c..08e244af 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/LocalPluginManager.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/LocalPluginManager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin import java.io.File import kotlinx.serialization.json.JsonDecodingException @@ -8,7 +8,7 @@ import mu.KotlinLogging * Saves plugin to the local filesystem. * * @param pluginCacheFile The plugin save file. - * @param officialPlugins The Axon-supported official plugins that should always be available to the + * @param officialPlugins The INNDiE-supported official plugins that should always be available to the * user. */ class LocalPluginManager( @@ -25,7 +25,9 @@ class LocalPluginManager( } val cache = try { - PluginCache.deserialize(pluginCacheFile.readText()) + PluginCache.deserialize( + pluginCacheFile.readText() + ) } catch (ex: JsonDecodingException) { LOGGER.warn(ex) { "Invalid plugin cache file contents. Creating new cache." } val newCache = PluginCache(setOf()) @@ -62,7 +64,10 @@ class LocalPluginManager( } private fun synchronizeCacheFile() { - pluginCacheFile.writeText(PluginCache(unofficialPlugins).serialize()) + pluginCacheFile.writeText( + PluginCache( + unofficialPlugins + ).serialize()) } companion object { diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/Plugin.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/Plugin.kt similarity index 84% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/Plugin.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/Plugin.kt index d784ddc0..feb64304 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/Plugin.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/Plugin.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration /** - * A plugin. Plugins are scripts that Axon includes in code generation for various purposes. + * A plugin. Plugins are scripts that INNDiE includes in code generation for various purposes. */ @Serializable sealed class Plugin { @@ -21,7 +21,7 @@ sealed class Plugin { abstract var contents: String /** - * An Axon-supported plugin that users get by default. + * An INNDiE-supported plugin that users get by default. */ @Serializable data class Official( diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginCache.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginCache.kt similarity index 94% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginCache.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginCache.kt index 8c6b73d4..4eb454f0 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginCache.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginCache.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginManager.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginManager.kt similarity index 96% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginManager.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginManager.kt index 429fa0ee..5ead122e 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/PluginManager.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/PluginManager.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin /** * Manages saving/loading plugins to/from persistent storage. diff --git a/plugin/src/main/kotlin/edu/wpi/axon/plugin/ProcessTestOutputPlugins.kt b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/ProcessTestOutputPlugins.kt similarity index 91% rename from plugin/src/main/kotlin/edu/wpi/axon/plugin/ProcessTestOutputPlugins.kt rename to plugin/src/main/kotlin/edu/wpi/inndie/plugin/ProcessTestOutputPlugins.kt index c4d563e5..64303459 100644 --- a/plugin/src/main/kotlin/edu/wpi/axon/plugin/ProcessTestOutputPlugins.kt +++ b/plugin/src/main/kotlin/edu/wpi/inndie/plugin/ProcessTestOutputPlugins.kt @@ -1,10 +1,11 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin object ProcessTestOutputPlugins { - val imageClassificationModelOutputPlugin = Plugin.Official( - "Image Classification", - """ + val imageClassificationModelOutputPlugin = + Plugin.Official( + "Image Classification", + """ |def process_model_output(model_input, expected_output, model_output): | import numpy as np | @@ -26,7 +27,7 @@ object ProcessTestOutputPlugins { | with tf.Session() as session: | session.run(fwrite) """.trimMargin() - ) + ) val autoMpgRegressionOutputPlugin = Plugin.Official( "Auto MPG Regression", diff --git a/plugin/src/test/kotlin/edu/wpi/axon/plugin/LocalPluginManagerTest.kt b/plugin/src/test/kotlin/edu/wpi/inndie/plugin/LocalPluginManagerTest.kt similarity index 83% rename from plugin/src/test/kotlin/edu/wpi/axon/plugin/LocalPluginManagerTest.kt rename to plugin/src/test/kotlin/edu/wpi/inndie/plugin/LocalPluginManagerTest.kt index 73118715..98a31ff8 100644 --- a/plugin/src/test/kotlin/edu/wpi/axon/plugin/LocalPluginManagerTest.kt +++ b/plugin/src/test/kotlin/edu/wpi/inndie/plugin/LocalPluginManagerTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.plugin +package edu.wpi.inndie.plugin import io.kotlintest.matchers.collections.shouldBeEmpty import io.kotlintest.matchers.collections.shouldContainExactly @@ -19,7 +19,10 @@ internal class LocalPluginManagerTest { Plugin.Official("b", "b") ) - LocalPluginManager(pluginCacheFile, officialPlugins).apply { initialize() } + LocalPluginManager( + pluginCacheFile, + officialPlugins + ).apply { initialize() } .listPlugins() .shouldContainExactlyInAnyOrder(officialPlugins) } @@ -27,7 +30,8 @@ internal class LocalPluginManagerTest { @Test fun `list plugins with just unofficial plugins`(@TempDir tempDir: File) { val pluginCacheFile = File(tempDir, "cache.json").apply { createNewFile() } - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() val unofficialPlugins = setOf( Plugin.Unofficial("a", "a"), @@ -50,7 +54,10 @@ internal class LocalPluginManagerTest { Plugin.Unofficial("b", "b") ) - val manager = LocalPluginManager(pluginCacheFile, officialPlugins) + val manager = LocalPluginManager( + pluginCacheFile, + officialPlugins + ) manager.initialize() unofficialPlugins.forEach { manager.addUnofficialPlugin(it) } manager.listPlugins().shouldContainExactlyInAnyOrder(officialPlugins + unofficialPlugins) @@ -59,7 +66,10 @@ internal class LocalPluginManagerTest { @Test fun `list plugins with calling initialize`(@TempDir tempDir: File) { File(tempDir, "cache.json").apply { createNewFile() } - shouldThrow { LocalPluginManager(tempDir, setOf()).listPlugins() } + shouldThrow { LocalPluginManager( + tempDir, + setOf() + ).listPlugins() } } @Test @@ -74,7 +84,8 @@ internal class LocalPluginManagerTest { pluginCacheFile.writeText(exampleCacheData.serialize()) - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() manager.listPlugins().shouldContainExactlyInAnyOrder(exampleCacheData.plugins) } @@ -88,7 +99,8 @@ internal class LocalPluginManagerTest { val exampleCacheData = PluginCache(setOf(plugin1)) pluginCacheFile.writeText(exampleCacheData.serialize()) - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() manager.addUnofficialPlugin(plugin2) @@ -102,10 +114,12 @@ internal class LocalPluginManagerTest { val plugin1 = Plugin.Unofficial("a", "a") val plugin2 = Plugin.Unofficial("b", "b") - val exampleCacheData = PluginCache(setOf(plugin1, plugin2)) + val exampleCacheData = + PluginCache(setOf(plugin1, plugin2)) pluginCacheFile.writeText(exampleCacheData.serialize()) - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() manager.removeUnofficialPlugin(plugin1.name) PluginCache.deserialize(pluginCacheFile.readText()).plugins @@ -117,7 +131,8 @@ internal class LocalPluginManagerTest { val pluginCacheFile = File(tempDir, "cache.json").apply { createNewFile() } pluginCacheFile.writeText(RandomStringUtils.randomAlphanumeric(10)) - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() manager.listPlugins().shouldBeEmpty() } @@ -128,10 +143,12 @@ internal class LocalPluginManagerTest { val plugin1 = Plugin.Unofficial("a", "a") val plugin2 = Plugin.Unofficial("b", "b") - val exampleCacheData = PluginCache(setOf(plugin1, plugin2)) + val exampleCacheData = + PluginCache(setOf(plugin1, plugin2)) pluginCacheFile.writeText(exampleCacheData.serialize()) - val manager = LocalPluginManager(pluginCacheFile, setOf()) + val manager = + LocalPluginManager(pluginCacheFile, setOf()) manager.initialize() val newPlugin1 = Plugin.Unofficial("a", "a1") manager.modifyUnofficialPlugin(plugin1.name, newPlugin1) diff --git a/settings.gradle.kts b/settings.gradle.kts index 6678f351..b08f36ab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ pluginManagement { } } -rootProject.name = "axon" +rootProject.name = "inndie" include(":aws") include(":db") diff --git a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/LocalTestRunner.kt b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/LocalTestRunner.kt similarity index 91% rename from test-runner/src/main/kotlin/edu/wpi/axon/testrunner/LocalTestRunner.kt rename to test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/LocalTestRunner.kt index 5f80a7f6..71076e55 100644 --- a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/LocalTestRunner.kt +++ b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/LocalTestRunner.kt @@ -1,22 +1,22 @@ -package edu.wpi.axon.testrunner +package edu.wpi.inndie.testrunner import arrow.core.Either import arrow.core.Valid import arrow.core.left import arrow.core.mapOf import arrow.core.right -import edu.wpi.axon.dsl.ScriptGenerator -import edu.wpi.axon.dsl.container.DefaultPolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.creating -import edu.wpi.axon.dsl.run -import edu.wpi.axon.dsl.task.LoadModelTask -import edu.wpi.axon.dsl.task.LoadStringTask -import edu.wpi.axon.dsl.task.RunInferenceTask -import edu.wpi.axon.dsl.task.RunPluginTask -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.util.runCommand +import edu.wpi.inndie.dsl.ScriptGenerator +import edu.wpi.inndie.dsl.container.DefaultPolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.creating +import edu.wpi.inndie.dsl.run +import edu.wpi.inndie.dsl.task.LoadModelTask +import edu.wpi.inndie.dsl.task.LoadStringTask +import edu.wpi.inndie.dsl.task.RunInferenceTask +import edu.wpi.inndie.dsl.task.RunPluginTask +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.util.runCommand import java.io.File import java.nio.file.Path import kotlinx.serialization.ImplicitReflectionSerializer @@ -162,7 +162,7 @@ class LocalTestRunner : TestRunner { "${testData.filePath.parent.toAbsolutePath()}:/test-data" ) } + listOf( - "wpilib/axon-ci:latest", + "wpilib/inndie-ci:latest", "/usr/bin/python3.6", "/home/$scriptFilename" ), diff --git a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestData.kt b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestData.kt similarity index 71% rename from test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestData.kt rename to test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestData.kt index 7767c117..cc42891c 100644 --- a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestData.kt +++ b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestData.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.testrunner +package edu.wpi.inndie.testrunner -import edu.wpi.axon.tfdata.Dataset +import edu.wpi.inndie.tfdata.Dataset import java.nio.file.Path sealed class TestData { diff --git a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestRunner.kt b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestRunner.kt similarity index 92% rename from test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestRunner.kt rename to test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestRunner.kt index fa9e5011..5f322ef4 100644 --- a/test-runner/src/main/kotlin/edu/wpi/axon/testrunner/TestRunner.kt +++ b/test-runner/src/main/kotlin/edu/wpi/inndie/testrunner/TestRunner.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.testrunner +package edu.wpi.inndie.testrunner import arrow.core.Either -import edu.wpi.axon.plugin.Plugin +import edu.wpi.inndie.plugin.Plugin import java.io.File import java.nio.file.Path diff --git a/test-runner/src/test/kotlin/edu/wpi/axon/testrunner/LocalTestRunnerIntegTest.kt b/test-runner/src/test/kotlin/edu/wpi/inndie/testrunner/LocalTestRunnerIntegTest.kt similarity index 95% rename from test-runner/src/test/kotlin/edu/wpi/axon/testrunner/LocalTestRunnerIntegTest.kt rename to test-runner/src/test/kotlin/edu/wpi/inndie/testrunner/LocalTestRunnerIntegTest.kt index 33d65ceb..8be7fbfe 100644 --- a/test-runner/src/test/kotlin/edu/wpi/axon/testrunner/LocalTestRunnerIntegTest.kt +++ b/test-runner/src/test/kotlin/edu/wpi/inndie/testrunner/LocalTestRunnerIntegTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.testrunner +package edu.wpi.inndie.testrunner -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.testutil.KoinTestFixture +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.testutil.KoinTestFixture import io.kotlintest.assertions.arrow.either.shouldBeLeft import io.kotlintest.assertions.arrow.either.shouldBeRight import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder diff --git a/test-runner/src/test/resources/edu/wpi/axon/testrunner/32_32_1_conv_sequential-trained.h5 b/test-runner/src/test/resources/edu/wpi/inndie/testrunner/32_32_1_conv_sequential-trained.h5 similarity index 100% rename from test-runner/src/test/resources/edu/wpi/axon/testrunner/32_32_1_conv_sequential-trained.h5 rename to test-runner/src/test/resources/edu/wpi/inndie/testrunner/32_32_1_conv_sequential-trained.h5 diff --git a/test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt b/test-util/src/main/kotlin/edu/wpi/inndie/testutil/KoinTestFixture.kt similarity index 92% rename from test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt rename to test-util/src/main/kotlin/edu/wpi/inndie/testutil/KoinTestFixture.kt index a6e8ca8f..27f04d26 100644 --- a/test-util/src/main/kotlin/edu/wpi/axon/testutil/KoinTestFixture.kt +++ b/test-util/src/main/kotlin/edu/wpi/inndie/testutil/KoinTestFixture.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.testutil +package edu.wpi.inndie.testutil import org.junit.jupiter.api.AfterEach import org.koin.core.context.stopKoin diff --git a/test-util/test-util.gradle.kts b/test-util/test-util.gradle.kts index 452837a2..c246af55 100644 --- a/test-util/test-util.gradle.kts +++ b/test-util/test-util.gradle.kts @@ -35,7 +35,7 @@ dependencies { // ) // TODO: Go back to the old dependencies once 4.x.x is out - // https://github.com/wpilibsuite/Axon/issues/84 + // https://github.com/wpilibsuite/INNDiE/issues/84 api(fileTree("$rootDir/libraries") { include("*.jar") exclude { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCode.kt similarity index 96% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCode.kt index 8ae8e394..ed98dc80 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCode.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code +package edu.wpi.inndie.tfdata.code -import edu.wpi.axon.tfdata.Dataset +import edu.wpi.inndie.tfdata.Dataset class DefaultExampleDatasetToCode : ExampleDatasetToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/ExampleDatasetToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/ExampleDatasetToCode.kt similarity index 84% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/ExampleDatasetToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/ExampleDatasetToCode.kt index 70e85dfa..4534c85e 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/ExampleDatasetToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/ExampleDatasetToCode.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code +package edu.wpi.inndie.tfdata.code -import edu.wpi.axon.tfdata.Dataset +import edu.wpi.inndie.tfdata.Dataset interface ExampleDatasetToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/PythonUtil.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/PythonUtil.kt similarity index 93% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/PythonUtil.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/PythonUtil.kt index 02788bc3..f98571e5 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/PythonUtil.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/PythonUtil.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.tfdata.code +package edu.wpi.inndie.tfdata.code import arrow.core.Either import arrow.core.Option import arrow.core.Tuple2 -import edu.wpi.axon.tfdata.SerializableEither -import edu.wpi.axon.tfdata.SerializableTuple2 +import edu.wpi.inndie.tfdata.SerializableEither +import edu.wpi.inndie.tfdata.SerializableTuple2 data class Unquoted(val value: String) data class ListAsList(val list: List) diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/ConstraintToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/ConstraintToCode.kt similarity index 79% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/ConstraintToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/ConstraintToCode.kt index bc1d9deb..440d366a 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/ConstraintToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/ConstraintToCode.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either -import edu.wpi.axon.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.layer.Constraint interface ConstraintToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCode.kt similarity index 89% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCode.kt index df413daf..c6302f23 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCode.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.right -import edu.wpi.axon.tfdata.code.namedArguments -import edu.wpi.axon.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.code.namedArguments +import edu.wpi.inndie.tfdata.layer.Constraint class DefaultConstraintToCode : ConstraintToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCode.kt similarity index 94% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCode.kt index 492e3e4a..e45656fe 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCode.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.right -import edu.wpi.axon.tfdata.code.namedArguments -import edu.wpi.axon.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.code.namedArguments +import edu.wpi.inndie.tfdata.layer.Initializer class DefaultInitializerToCode : InitializerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCode.kt similarity index 96% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCode.kt index 6f1584cc..bbea399d 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCode.kt @@ -1,15 +1,15 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either import arrow.core.Left import arrow.core.extensions.fx import arrow.core.right -import edu.wpi.axon.tfdata.code.asTuple -import edu.wpi.axon.tfdata.code.namedArguments -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.tfdata.code.unquoted -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.code.asTuple +import edu.wpi.inndie.tfdata.code.namedArguments +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.tfdata.code.unquoted +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer import org.koin.core.KoinComponent import org.koin.core.inject diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCode.kt similarity index 76% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCode.kt index 0c5e38c7..631f9912 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCode.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.right -import edu.wpi.axon.tfdata.layer.Regularizer +import edu.wpi.inndie.tfdata.layer.Regularizer class DefaultRegularizerToCode : RegularizerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/InitializerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/InitializerToCode.kt similarity index 79% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/InitializerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/InitializerToCode.kt index df970a82..b9b75d63 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/InitializerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/InitializerToCode.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either -import edu.wpi.axon.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.layer.Initializer interface InitializerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/LayerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/LayerToCode.kt similarity index 80% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/LayerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/LayerToCode.kt index 8ceb8a5c..52d64aec 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/LayerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/LayerToCode.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer interface LayerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/RegularizerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/RegularizerToCode.kt similarity index 79% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/RegularizerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/RegularizerToCode.kt index 874c4469..23bf3fee 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/layer/RegularizerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/layer/RegularizerToCode.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either -import edu.wpi.axon.tfdata.layer.Regularizer +import edu.wpi.inndie.tfdata.layer.Regularizer interface RegularizerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCode.kt similarity index 82% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCode.kt index 61ed87e1..07af5701 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCode.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code.loss +package edu.wpi.inndie.tfdata.code.loss -import edu.wpi.axon.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.loss.Loss class DefaultLossToCode : LossToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/LossToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/LossToCode.kt similarity index 75% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/LossToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/LossToCode.kt index f6e0479c..bf1d808f 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/loss/LossToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/loss/LossToCode.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code.loss +package edu.wpi.inndie.tfdata.code.loss -import edu.wpi.axon.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.loss.Loss interface LossToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCode.kt similarity index 86% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCode.kt index c6b4c9cb..395e7d00 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCode.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tfdata.code.optimizer +package edu.wpi.inndie.tfdata.code.optimizer -import edu.wpi.axon.tfdata.code.pythonString -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.code.pythonString +import edu.wpi.inndie.tfdata.optimizer.Optimizer class DefaultOptimizerToCode : OptimizerToCode { diff --git a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/OptimizerToCode.kt b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/OptimizerToCode.kt similarity index 74% rename from tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/OptimizerToCode.kt rename to tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/OptimizerToCode.kt index 4fe77c45..cc69f120 100644 --- a/tf-data-code/src/main/kotlin/edu/wpi/axon/tfdata/code/optimizer/OptimizerToCode.kt +++ b/tf-data-code/src/main/kotlin/edu/wpi/inndie/tfdata/code/optimizer/OptimizerToCode.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code.optimizer +package edu.wpi.inndie.tfdata.code.optimizer -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.optimizer.Optimizer interface OptimizerToCode { diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCodeTest.kt similarity index 84% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCodeTest.kt index d321b9e3..e202cd9c 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/DefaultExampleDatasetToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/DefaultExampleDatasetToCodeTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code +package edu.wpi.inndie.tfdata.code -import edu.wpi.axon.tfdata.Dataset +import edu.wpi.inndie.tfdata.Dataset import io.kotlintest.shouldBe import org.junit.jupiter.api.Test diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCodeTest.kt similarity index 93% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCodeTest.kt index 68c7b9e2..40631938 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultConstraintToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultConstraintToCodeTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either import arrow.core.right -import edu.wpi.axon.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.layer.Constraint import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCodeTest.kt similarity index 93% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCodeTest.kt index 10c55664..6f852a75 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultInitializerToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultInitializerToCodeTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either import arrow.core.right -import edu.wpi.axon.tfdata.SerializableEitherDLd -import edu.wpi.axon.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.SerializableEitherDLd +import edu.wpi.inndie.tfdata.layer.Initializer import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments @@ -23,7 +23,8 @@ internal class DefaultInitializerToCodeTest { @Suppress("unused", "LongMethod", "StringLiteralDuplication") fun initializerSource() = listOf( Arguments.of( - Initializer.Constant(SerializableEitherDLd.Left(0.0)), + Initializer.Constant( + SerializableEitherDLd.Left(0.0)), "tf.keras.initializers.Constant(value=0.0)".right() ), Arguments.of( diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCodeTest.kt similarity index 90% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCodeTest.kt index 41faedee..724e43a9 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultLayerToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultLayerToCodeTest.kt @@ -1,20 +1,20 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either import arrow.core.Right import arrow.core.left import arrow.core.right -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.SerializableEitherITii -import edu.wpi.axon.tfdata.SerializableTuple2II -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Constraint -import edu.wpi.axon.tfdata.layer.DataFormat -import edu.wpi.axon.tfdata.layer.Initializer -import edu.wpi.axon.tfdata.layer.Interpolation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.layer.PoolingPadding -import edu.wpi.axon.tfdata.layer.Regularizer +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.SerializableEitherITii +import edu.wpi.inndie.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.layer.DataFormat +import edu.wpi.inndie.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.layer.Interpolation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.PoolingPadding +import edu.wpi.inndie.tfdata.layer.Regularizer import io.kotlintest.shouldBe import io.mockk.every import io.mockk.mockk @@ -133,8 +133,12 @@ internal class DefaultLayerToCodeTest : KoinTestFixture() { Layer.MaxPooling2D( "name", null, - SerializableEitherITii.Right(SerializableTuple2II(1, 2)), - SerializableEitherITii.Right(SerializableTuple2II(3, 4)), + SerializableEitherITii.Right( + SerializableTuple2II(1, 2) + ), + SerializableEitherITii.Right( + SerializableTuple2II(3, 4) + ), PoolingPadding.Valid, DataFormat.ChannelsFirst ), @@ -205,7 +209,9 @@ internal class DefaultLayerToCodeTest : KoinTestFixture() { Layer.AveragePooling2D( "name", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), SerializableEitherITii.Left(3), PoolingPadding.Valid, DataFormat.ChannelsLast @@ -242,7 +248,9 @@ internal class DefaultLayerToCodeTest : KoinTestFixture() { Layer.UpSampling2D( "name", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), null, Interpolation.Nearest ), diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCodeTest.kt similarity index 90% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCodeTest.kt index 75dab570..145ae61c 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/layer/DefaultRegularizerToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/layer/DefaultRegularizerToCodeTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.code.layer +package edu.wpi.inndie.tfdata.code.layer import arrow.core.Either import arrow.core.right -import edu.wpi.axon.tfdata.layer.Regularizer +import edu.wpi.inndie.tfdata.layer.Regularizer import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCodeTest.kt similarity index 92% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCodeTest.kt index 8bb153bf..4f41c319 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/loss/DefaultLossToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/loss/DefaultLossToCodeTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code.loss +package edu.wpi.inndie.tfdata.code.loss -import edu.wpi.axon.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.loss.Loss import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt similarity index 92% rename from tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt rename to tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt index 4000912d..8b3be9cb 100644 --- a/tf-data-code/src/test/kotlin/edu/wpi/axon/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt +++ b/tf-data-code/src/test/kotlin/edu/wpi/inndie/tfdata/code/optimizer/DefaultOptimizerToCodeTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.code.optimizer +package edu.wpi.inndie.tfdata.code.optimizer -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.optimizer.Optimizer import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Dataset.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Dataset.kt similarity index 97% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Dataset.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Dataset.kt index 7f41429c..dde01419 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Dataset.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Dataset.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.util.FilePath import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Model.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Model.kt similarity index 95% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Model.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Model.kt index a20dec67..d031b7e1 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Model.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Model.kt @@ -1,9 +1,9 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata import com.google.common.graph.ImmutableGraph -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequency.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequency.kt similarity index 95% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequency.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequency.kt index 505d768e..cd3774af 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequency.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequency.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata sealed class ModelCheckpointSaveFrequency { diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/SerializerUtil.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/SerializerUtil.kt similarity index 86% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/SerializerUtil.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/SerializerUtil.kt index 56a12e75..ec9f199c 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/SerializerUtil.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/SerializerUtil.kt @@ -1,6 +1,6 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata import arrow.core.Either import arrow.core.Option @@ -29,9 +29,11 @@ interface SerializableOption { } @Serializable -data class SerializableOptionB(override val value: Boolean?) : SerializableOption { +data class SerializableOptionB(override val value: Boolean?) : + SerializableOption { companion object { - fun fromOption(option: Option) = SerializableOptionB(option.orNull()) + fun fromOption(option: Option) = + SerializableOptionB(option.orNull()) } } @@ -40,7 +42,8 @@ interface SerializableEither { } @Serializable -sealed class SerializableEitherITii : SerializableEither { +sealed class SerializableEitherITii : + SerializableEither { @Serializable data class Left(val value: Int) : SerializableEitherITii() @@ -57,14 +60,19 @@ sealed class SerializableEitherITii : SerializableEither): SerializableEitherITii = when (either) { - is Either.Left -> Left(either.a) - is Either.Right -> Right(either.b) + is Either.Left -> Left( + either.a + ) + is Either.Right -> Right( + either.b + ) } } } @Serializable -sealed class SerializableEitherDLd : SerializableEither> { +sealed class SerializableEitherDLd : + SerializableEither> { @Serializable data class Left(val value: Double) : SerializableEitherDLd() @@ -81,8 +89,12 @@ sealed class SerializableEitherDLd : SerializableEither> { fun fromEither(either: Either>): SerializableEitherDLd = when (either) { - is Either.Left -> Left(either.a) - is Either.Right -> Right(either.b) + is Either.Left -> Left( + either.a + ) + is Either.Right -> Right( + either.b + ) } } } diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Verbosity.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Verbosity.kt similarity index 94% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Verbosity.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Verbosity.kt index 9ab92b50..3a06a208 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/Verbosity.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/Verbosity.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata /** * A verbosity level for training. diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Activation.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Activation.kt similarity index 90% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Activation.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Activation.kt index 6ca1db20..01b3df14 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Activation.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Activation.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer import kotlinx.serialization.Serializable @@ -24,7 +24,7 @@ sealed class Activation { object SoftMax : Activation() /** - * A placeholder activation function for an activation function that Axon does not understand. + * A placeholder activation function for an activation function that INNDiE does not understand. */ @Serializable data class UnknownActivation(val name: String) : Activation() diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Constraint.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Constraint.kt similarity index 96% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Constraint.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Constraint.kt index 3052005b..398ec010 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Constraint.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Constraint.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer import kotlinx.serialization.Serializable diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/DataFormat.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/DataFormat.kt similarity index 85% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/DataFormat.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/DataFormat.kt index 0b175f36..552c5f4f 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/DataFormat.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/DataFormat.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer /** * Valid values for the `data_format` parameter on Pooling-type and Flatten layers. diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Initializer.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Initializer.kt similarity index 97% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Initializer.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Initializer.kt index 452a19e2..9e0fc421 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Initializer.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Initializer.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer -import edu.wpi.axon.tfdata.SerializableEitherDLd +import edu.wpi.inndie.tfdata.SerializableEitherDLd import kotlinx.serialization.Serializable /** diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Interpolation.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Interpolation.kt similarity index 82% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Interpolation.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Interpolation.kt index ef9a1369..76d861d6 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Interpolation.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Interpolation.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer /** * Values for the `interpolation` parameter for sampling-type layers. diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Layer.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Layer.kt similarity index 90% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Layer.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Layer.kt index 4d635730..721211b7 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Layer.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Layer.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableEitherITii -import edu.wpi.axon.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableEitherITii +import edu.wpi.inndie.tfdata.SerializableTuple2II import kotlinx.serialization.Serializable /** @@ -29,13 +29,22 @@ sealed class Layer { * @return A new [MetaLayer.TrainableLayer] that wraps this layer. */ fun isTrainable(trainable: Boolean = true) = - MetaLayer.TrainableLayer(name, inputs, this, trainable) + MetaLayer.TrainableLayer( + name, + inputs, + this, + trainable + ) /** * @return A new [MetaLayer.UntrainableLayer] that wraps this layer. */ fun untrainable() = - MetaLayer.UntrainableLayer(name, inputs, this) + MetaLayer.UntrainableLayer( + name, + inputs, + this + ) abstract fun copyWithNewInputs(inputs: Set): Layer @@ -99,7 +108,7 @@ sealed class Layer { } /** - * A placeholder layer for a layer that Axon does not understand. + * A placeholder layer for a layer that INNDiE does not understand. */ @Serializable data class UnknownLayer( @@ -154,7 +163,13 @@ sealed class Layer { batchSize: Int? = null, dtype: Double? = null, sparse: Boolean = false - ) = InputLayer(name, shape, batchSize, dtype, sparse).untrainable() + ) = InputLayer( + name, + shape, + batchSize, + dtype, + sparse + ).untrainable() } } @@ -198,7 +213,12 @@ sealed class Layer { override val name: String, override val inputs: Set?, val poolSize: SerializableEitherITii = - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II( + 2, + 2 + ) + ), val strides: SerializableEitherITii? = null, val padding: PoolingPadding = PoolingPadding.Valid, val dataFormat: DataFormat? = null @@ -232,7 +252,9 @@ sealed class Layer { val units: Int, val activation: Activation = Activation.Linear, val useBias: Boolean = true, - val kernelInitializer: Initializer = Initializer.GlorotUniform(null), + val kernelInitializer: Initializer = Initializer.GlorotUniform( + null + ), val biasInitializer: Initializer = Initializer.Zeros, val kernelRegularizer: Regularizer? = null, val biasRegularizer: Regularizer? = null, @@ -312,7 +334,12 @@ sealed class Layer { override val name: String, override val inputs: Set?, val poolSize: SerializableEitherITii = - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II( + 2, + 2 + ) + ), val strides: SerializableEitherITii? = null, val padding: PoolingPadding = PoolingPadding.Valid, val dataFormat: DataFormat? = null @@ -351,7 +378,12 @@ sealed class Layer { override val name: String, override val inputs: Set?, val size: SerializableEitherITii = - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II( + 2, + 2 + ) + ), val dataFormat: DataFormat? = null, val interpolation: Interpolation = Interpolation.Nearest ) : Layer() { diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/PoolingPadding.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/PoolingPadding.kt similarity index 81% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/PoolingPadding.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/PoolingPadding.kt index 69a74c66..9e813d91 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/PoolingPadding.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/PoolingPadding.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer /** * Valid values for the `padding` parameter on Pooling-type layers. diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Regularizer.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Regularizer.kt similarity index 74% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Regularizer.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Regularizer.kt index f0d478a6..7810850c 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/layer/Regularizer.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/layer/Regularizer.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.layer +package edu.wpi.inndie.tfdata.layer import com.google.common.math.DoubleMath import kotlinx.serialization.Serializable @@ -19,8 +19,12 @@ sealed class Regularizer { if (this === other) return true if (other !is L1L2) return false - if (!DoubleMath.fuzzyEquals(l1, other.l1, tolerance)) return false - if (!DoubleMath.fuzzyEquals(l2, other.l2, tolerance)) return false + if (!DoubleMath.fuzzyEquals(l1, other.l1, + tolerance + )) return false + if (!DoubleMath.fuzzyEquals(l2, other.l2, + tolerance + )) return false return true } diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/loss/Loss.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/loss/Loss.kt similarity index 94% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/loss/Loss.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/loss/Loss.kt index 8a4e789b..7fce9387 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/loss/Loss.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/loss/Loss.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.loss +package edu.wpi.inndie.tfdata.loss import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/optimizer/Optimizer.kt b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/optimizer/Optimizer.kt similarity index 97% rename from tf-data/src/main/kotlin/edu/wpi/axon/tfdata/optimizer/Optimizer.kt rename to tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/optimizer/Optimizer.kt index 07313302..cbf9515b 100644 --- a/tf-data/src/main/kotlin/edu/wpi/axon/tfdata/optimizer/Optimizer.kt +++ b/tf-data/src/main/kotlin/edu/wpi/inndie/tfdata/optimizer/Optimizer.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.optimizer +package edu.wpi.inndie.tfdata.optimizer import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/layer/LayerTest.kt b/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/layer/LayerTest.kt deleted file mode 100644 index d0cd861a..00000000 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/layer/LayerTest.kt +++ /dev/null @@ -1,30 +0,0 @@ -package edu.wpi.axon.tfdata.layer - -import io.kotlintest.shouldNotThrow -import io.kotlintest.shouldThrow -import org.junit.jupiter.api.Test - -internal class LayerTest { - - @Test - fun `dropout with valid rate`() { - shouldNotThrow { Layer.Dropout("", null, 0.5) } - } - - @Test - fun `dropout with invalid rate`() { - shouldThrow { Layer.Dropout("", null, -0.1) } - shouldThrow { Layer.Dropout("", null, 1.2) } - } - - @Test - fun `spatialdropout2d with valid rate`() { - shouldNotThrow { Layer.SpatialDropout2D("", null, 0.5) } - } - - @Test - fun `spatialdropout2d with invalid rate`() { - shouldThrow { Layer.SpatialDropout2D("", null, -0.1) } - shouldThrow { Layer.SpatialDropout2D("", null, 1.2) } - } -} diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/DatasetTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/DatasetTest.kt similarity index 96% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/DatasetTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/DatasetTest.kt index 08482c0a..7e4ca0fe 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/DatasetTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/DatasetTest.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.util.FilePath import io.kotlintest.shouldBe import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequencyTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequencyTest.kt similarity index 92% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequencyTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequencyTest.kt index fb2c8bcb..7cba2e8d 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelCheckpointSaveFrequencyTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelCheckpointSaveFrequencyTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata import io.kotlintest.shouldBe import org.junit.jupiter.api.Test diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelTest.kt similarity index 76% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelTest.kt index 4dae414c..f5f3df5a 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/ModelTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/ModelTest.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata import com.google.common.graph.GraphBuilder -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.shouldBe import kotlin.random.Random import org.apache.commons.lang3.RandomStringUtils @@ -17,7 +17,11 @@ internal class ModelTest { RandomStringUtils.randomAlphanumeric(10), (1..3).map { Random.nextInt(128) }, setOf( - Layer.Dense(RandomStringUtils.randomAlphanumeric(10), null, 10).isTrainable(), + Layer.Dense( + RandomStringUtils.randomAlphanumeric( + 10 + ), null, 10 + ).isTrainable(), Layer.Conv2D( RandomStringUtils.randomAlphanumeric(10), null, @@ -25,7 +29,10 @@ internal class ModelTest { SerializableTuple2II(3, 3), Activation.SoftMax ).isTrainable(), - Layer.AveragePooling2D(RandomStringUtils.randomAlphanumeric(10), null).untrainable() + Layer.AveragePooling2D( + RandomStringUtils.randomAlphanumeric(10), + null + ).untrainable() ) ) @@ -59,7 +66,11 @@ internal class ModelTest { (1..3).map { Random.nextInt(128) } )), graph.toImmutableGraph(), - setOf(Model.General.OutputData(RandomStringUtils.randomAlphanumeric(10))) + setOf( + Model.General.OutputData( + RandomStringUtils.randomAlphanumeric(10) + ) + ) ) Model.deserialize(before.serialize()).shouldBe(before) diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/VerbosityTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/VerbosityTest.kt similarity index 93% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/VerbosityTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/VerbosityTest.kt index f8f6c6bf..c733b428 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/VerbosityTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/VerbosityTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata +package edu.wpi.inndie.tfdata import io.kotlintest.shouldBe import org.junit.jupiter.api.Test diff --git a/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/layer/LayerTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/layer/LayerTest.kt new file mode 100644 index 00000000..ce2f1c47 --- /dev/null +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/layer/LayerTest.kt @@ -0,0 +1,66 @@ +package edu.wpi.inndie.tfdata.layer + +import io.kotlintest.shouldNotThrow +import io.kotlintest.shouldThrow +import org.junit.jupiter.api.Test + +internal class LayerTest { + + @Test + fun `dropout with valid rate`() { + shouldNotThrow { + Layer.Dropout( + "", + null, + 0.5 + ) + } + } + + @Test + fun `dropout with invalid rate`() { + shouldThrow { + Layer.Dropout( + "", + null, + -0.1 + ) + } + shouldThrow { + Layer.Dropout( + "", + null, + 1.2 + ) + } + } + + @Test + fun `spatialdropout2d with valid rate`() { + shouldNotThrow { + Layer.SpatialDropout2D( + "", + null, + 0.5 + ) + } + } + + @Test + fun `spatialdropout2d with invalid rate`() { + shouldThrow { + Layer.SpatialDropout2D( + "", + null, + -0.1 + ) + } + shouldThrow { + Layer.SpatialDropout2D( + "", + null, + 1.2 + ) + } + } +} diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/loss/LossTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/loss/LossTest.kt similarity index 94% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/loss/LossTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/loss/LossTest.kt index 59b5ad47..74c423b0 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/loss/LossTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/loss/LossTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.loss +package edu.wpi.inndie.tfdata.loss import io.kotlintest.shouldBe import org.junit.jupiter.params.ParameterizedTest diff --git a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/optimizer/OptimizerTest.kt b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/optimizer/OptimizerTest.kt similarity index 86% rename from tf-data/src/test/kotlin/edu/wpi/axon/tfdata/optimizer/OptimizerTest.kt rename to tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/optimizer/OptimizerTest.kt index 49908483..b77728d1 100644 --- a/tf-data/src/test/kotlin/edu/wpi/axon/tfdata/optimizer/OptimizerTest.kt +++ b/tf-data/src/test/kotlin/edu/wpi/inndie/tfdata/optimizer/OptimizerTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tfdata.optimizer +package edu.wpi.inndie.tfdata.optimizer import io.kotlintest.shouldBe import kotlin.random.Random @@ -11,7 +11,8 @@ internal class OptimizerTest { @ParameterizedTest @MethodSource("optimizerSource") fun `test serialization`(optimizer: Optimizer) { - Optimizer.deserialize(optimizer.serialize()).shouldBe(optimizer) + Optimizer.deserialize(optimizer.serialize()) + .shouldBe(optimizer) } companion object { diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraph.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraph.kt similarity index 90% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraph.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraph.kt index 6276504f..6a633ebd 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraph.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraph.kt @@ -1,6 +1,6 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import arrow.core.Either import arrow.core.extensions.either.monadError.monadError @@ -9,9 +9,9 @@ import arrow.fx.IO import com.google.common.base.Throwables import com.google.common.graph.GraphBuilder import com.google.common.graph.ImmutableGraph -import edu.wpi.axon.tfdata.LayerGraph -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.util.checkIslands +import edu.wpi.inndie.tfdata.LayerGraph +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.util.checkIslands class DefaultLayersToGraph : LayersToGraph { diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoader.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoader.kt similarity index 94% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoader.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoader.kt index bbae2083..5a3705d2 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoader.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoader.kt @@ -1,6 +1,6 @@ @file:Suppress("UNCHECKED_CAST", "StringLiteralDuplication") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import arrow.core.Left import arrow.core.Right @@ -8,19 +8,19 @@ import arrow.fx.IO import com.beust.klaxon.JsonArray import com.beust.klaxon.JsonObject import com.beust.klaxon.Parser -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableEitherDLd -import edu.wpi.axon.tfdata.SerializableEitherITii -import edu.wpi.axon.tfdata.SerializableTuple2II -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Constraint -import edu.wpi.axon.tfdata.layer.DataFormat -import edu.wpi.axon.tfdata.layer.Initializer -import edu.wpi.axon.tfdata.layer.Interpolation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.layer.PoolingPadding -import edu.wpi.axon.tfdata.layer.Regularizer -import edu.wpi.axon.util.singleAssign +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableEitherDLd +import edu.wpi.inndie.tfdata.SerializableEitherITii +import edu.wpi.inndie.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.layer.DataFormat +import edu.wpi.inndie.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.layer.Interpolation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.PoolingPadding +import edu.wpi.inndie.tfdata.layer.Regularizer +import edu.wpi.inndie.util.singleAssign import io.jhdf.HdfFile import java.io.File @@ -181,7 +181,12 @@ internal class HDF5ModelLoader( name, data.inboundNodes(), json["filters"] as Int, - (json["kernel_size"] as JsonArray).let { SerializableTuple2II(it[0], it[1]) }, + (json["kernel_size"] as JsonArray).let { + SerializableTuple2II( + it[0], + it[1] + ) + }, parseActivation(json) ) diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayerGraphUtil.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayerGraphUtil.kt similarity index 95% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayerGraphUtil.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayerGraphUtil.kt index 88382470..f508aaa6 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayerGraphUtil.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayerGraphUtil.kt @@ -1,14 +1,14 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import arrow.Kind import arrow.core.Either import arrow.typeclasses.MonadError import com.google.common.graph.Graph -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.util.allIn -import edu.wpi.axon.util.breadthFirstSearch +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.util.allIn +import edu.wpi.inndie.util.breadthFirstSearch /** * Validated a layer graph. diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayersToGraph.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayersToGraph.kt similarity index 76% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayersToGraph.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayersToGraph.kt index c5bb2acb..c5661f8b 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/LayersToGraph.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/LayersToGraph.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import arrow.core.Either -import edu.wpi.axon.tfdata.LayerGraph -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.LayerGraph +import edu.wpi.inndie.tfdata.layer.Layer @Suppress("UnstableApiUsage") interface LayersToGraph { diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoader.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoader.kt similarity index 80% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoader.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoader.kt index 207393e1..27a6abc9 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoader.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoader.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import arrow.fx.IO -import edu.wpi.axon.tfdata.Model +import edu.wpi.inndie.tfdata.Model import java.io.File interface ModelLoader { diff --git a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactory.kt b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactory.kt similarity index 93% rename from tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactory.kt rename to tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactory.kt index d6849093..d9d06595 100644 --- a/tf-layer-loader/src/main/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactory.kt +++ b/tf-layer-loader/src/main/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactory.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader class ModelLoaderFactory { diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraphTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraphTest.kt similarity index 96% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraphTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraphTest.kt index d2d99409..071cd72f 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/DefaultLayersToGraphTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/DefaultLayersToGraphTest.kt @@ -1,10 +1,10 @@ @file:SuppressWarnings("LongMethod", "LargeClass", "StringLiteralDuplication") @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import com.google.common.graph.EndpointPair -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.assertions.arrow.either.shouldBeLeft import io.kotlintest.assertions.arrow.either.shouldBeRight import io.kotlintest.matchers.collections.shouldContainExactly @@ -14,7 +14,8 @@ import org.junit.jupiter.api.Test internal class DefaultLayersToGraphTest { - private val layersToGraph = DefaultLayersToGraph() + private val layersToGraph = + DefaultLayersToGraph() @Test fun `no layers makes an empty graph`() { diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoaderIntegrationTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoaderIntegrationTest.kt similarity index 90% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoaderIntegrationTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoaderIntegrationTest.kt index 32e197cc..1b8c3d17 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/HDF5ModelLoaderIntegrationTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/HDF5ModelLoaderIntegrationTest.kt @@ -1,15 +1,15 @@ @file:SuppressWarnings("LongMethod", "LargeClass") @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableEitherITii -import edu.wpi.axon.tfdata.SerializableTuple2II -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.DataFormat -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.layer.PoolingPadding +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableEitherITii +import edu.wpi.inndie.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.DataFormat +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.PoolingPadding import io.kotlintest.matchers.booleans.shouldBeTrue import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder @@ -85,8 +85,12 @@ internal class HDF5ModelLoaderIntegrationTest { Layer.MaxPooling2D( "max_pooling2d_8", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), PoolingPadding.Valid, DataFormat.ChannelsLast ).isTrainable(), diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt similarity index 92% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt index eacd8de1..384cad52 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithConstraintsIntegrationTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Constraint -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Constraint +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.shouldBe import org.junit.jupiter.api.Test diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt similarity index 92% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt index 9e6a7b64..cd745c6f 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithInitializersIntegrationTest.kt @@ -1,12 +1,12 @@ @file:SuppressWarnings("LongMethod", "LargeClass", "TooManyFunctions") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableEitherDLd -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Initializer -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableEitherDLd +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Initializer +import edu.wpi.inndie.tfdata.layer.Layer import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.shouldBe import org.junit.jupiter.api.Test @@ -24,7 +24,8 @@ internal class LoadLayersWithInitializersIntegrationTest { null, 1, Activation.Linear, - kernelInitializer = Initializer.Constant(SerializableEitherDLd.Left(0.0)) + kernelInitializer = Initializer.Constant( + SerializableEitherDLd.Left(0.0)) ).isTrainable() ) } @@ -41,7 +42,8 @@ internal class LoadLayersWithInitializersIntegrationTest { null, 2, Activation.Linear, - kernelInitializer = Initializer.Constant(SerializableEitherDLd.Right(listOf(1.0, 2.1))) + kernelInitializer = Initializer.Constant( + SerializableEitherDLd.Right(listOf(1.0, 2.1))) ).isTrainable() ) } @@ -58,7 +60,8 @@ internal class LoadLayersWithInitializersIntegrationTest { null, 2, Activation.Linear, - kernelInitializer = Initializer.Constant(SerializableEitherDLd.Right(listOf(1.0, 2.1))) + kernelInitializer = Initializer.Constant( + SerializableEitherDLd.Right(listOf(1.0, 2.1))) ).isTrainable() ) } @@ -75,7 +78,8 @@ internal class LoadLayersWithInitializersIntegrationTest { null, 2, Activation.Linear, - kernelInitializer = Initializer.Constant(SerializableEitherDLd.Right(listOf(1.0, 2.1))) + kernelInitializer = Initializer.Constant( + SerializableEitherDLd.Right(listOf(1.0, 2.1))) ).isTrainable() ) } @@ -143,7 +147,8 @@ internal class LoadLayersWithInitializersIntegrationTest { null, 2, Activation.Linear, - kernelInitializer = Initializer.RandomUniform(SerializableEitherDLd.Left(-0.1), SerializableEitherDLd.Left(0.1), null) + kernelInitializer = Initializer.RandomUniform( + SerializableEitherDLd.Left(-0.1), SerializableEitherDLd.Left(0.1), null) ).isTrainable() ) } diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt similarity index 78% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt index 194bc965..8cc663e0 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadLayersWithRegularizersIntegrationTest.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.layer.Regularizer +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Regularizer import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.shouldBe import org.junit.jupiter.api.Test diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt similarity index 76% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt index 32fa790a..0b7b3701 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/LoadSpecificLayerTypesIntegrationTest.kt @@ -1,15 +1,15 @@ @file:SuppressWarnings("LongMethod", "LargeClass") @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.SerializableEitherITii -import edu.wpi.axon.tfdata.SerializableTuple2II -import edu.wpi.axon.tfdata.layer.DataFormat -import edu.wpi.axon.tfdata.layer.Interpolation -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tfdata.layer.PoolingPadding +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.SerializableEitherITii +import edu.wpi.inndie.tfdata.SerializableTuple2II +import edu.wpi.inndie.tfdata.layer.DataFormat +import edu.wpi.inndie.tfdata.layer.Interpolation +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.PoolingPadding import io.kotlintest.matchers.collections.shouldContainExactly import io.kotlintest.shouldBe import org.junit.jupiter.api.Test @@ -25,8 +25,12 @@ internal class LoadSpecificLayerTypesIntegrationTest { Layer.AveragePooling2D( "average_pooling2d_7", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), PoolingPadding.Valid, DataFormat.ChannelsLast ).isTrainable() @@ -74,7 +78,9 @@ internal class LoadSpecificLayerTypesIntegrationTest { Layer.UpSampling2D( "up_sampling2d_3", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), DataFormat.ChannelsLast, Interpolation.Nearest ).isTrainable() @@ -91,7 +97,9 @@ internal class LoadSpecificLayerTypesIntegrationTest { Layer.UpSampling2D( "up_sampling2d_2", null, - SerializableEitherITii.Right(SerializableTuple2II(2, 2)), + SerializableEitherITii.Right( + SerializableTuple2II(2, 2) + ), DataFormat.ChannelsLast, Interpolation.Bilinear ).isTrainable() diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactoryTest.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactoryTest.kt similarity index 94% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactoryTest.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactoryTest.kt index f3db3108..1d446c10 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelLoaderFactoryTest.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelLoaderFactoryTest.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader import kotlin.test.assertTrue import org.junit.jupiter.api.Test diff --git a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelTestUtil.kt b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelTestUtil.kt similarity index 93% rename from tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelTestUtil.kt rename to tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelTestUtil.kt index ed30c669..6bdd5283 100644 --- a/tf-layer-loader/src/test/kotlin/edu/wpi/axon/tflayerloader/ModelTestUtil.kt +++ b/tf-layer-loader/src/test/kotlin/edu/wpi/inndie/tflayerloader/ModelTestUtil.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.tflayerloader +package edu.wpi.inndie.tflayerloader -import edu.wpi.axon.tfdata.Model +import edu.wpi.inndie.tfdata.Model import io.kotlintest.assertions.arrow.either.shouldBeLeft import io.kotlintest.matchers.types.shouldBeInstanceOf import java.io.File diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/badModel1.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/badModel1.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/badModel1.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/badModel1.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/mobilenetv2_1.00_224.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/mobilenetv2_1.00_224.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/mobilenetv2_1.00_224.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/mobilenetv2_1.00_224.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/mobilenetv2_tf-1-15.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/mobilenetv2_tf-1-15.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/mobilenetv2_tf-1-15.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/mobilenetv2_tf-1-15.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/model1.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/model1.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/model1.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/model1.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/nonSequentialModel1.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/nonSequentialModel1.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/nonSequentialModel1.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/nonSequentialModel1.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/rnn1.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/rnn1.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/rnn1.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/rnn1.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_avgpool2d.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_avgpool2d.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_avgpool2d.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_avgpool2d.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_int_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_int_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_int_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_int_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_list_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_list_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_list_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_list_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_nparray_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_nparray_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_nparray_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_nparray_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_tuple_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_tuple_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_constant_tuple_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_constant_tuple_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_globalmaxpooling2d.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_globalmaxpooling2d.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_globalmaxpooling2d.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_globalmaxpooling2d.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_glorotnormal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_glorotnormal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_glorotnormal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_glorotnormal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_glorotuniform_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_glorotuniform_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_glorotuniform_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_glorotuniform_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_identity_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_identity_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_identity_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_identity_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_l1_regularizer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_l1_regularizer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_l1_regularizer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_l1_regularizer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_maxnorm_constraint.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_maxnorm_constraint.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_maxnorm_constraint.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_maxnorm_constraint.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_minmaxnorm_constraint.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_minmaxnorm_constraint.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_minmaxnorm_constraint.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_minmaxnorm_constraint.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_nonneg_constraint.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_nonneg_constraint.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_nonneg_constraint.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_nonneg_constraint.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_orthogonal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_orthogonal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_orthogonal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_orthogonal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomnormal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomnormal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomnormal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomnormal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomuniform_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomuniform_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomuniform_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomuniform_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomuniform_tensor_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomuniform_tensor_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_randomuniform_tensor_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_randomuniform_tensor_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_spatialdropout2d.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_spatialdropout2d.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_spatialdropout2d.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_spatialdropout2d.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_truncatednormal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_truncatednormal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_truncatednormal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_truncatednormal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_unitnorm_constraint.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_unitnorm_constraint.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_unitnorm_constraint.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_unitnorm_constraint.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_upsampling2d_bilinear.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_upsampling2d_bilinear.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_upsampling2d_bilinear.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_upsampling2d_bilinear.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_upsampling2d_nearest.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_upsampling2d_nearest.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_upsampling2d_nearest.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_upsampling2d_nearest.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanavg_truncatednormal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanavg_truncatednormal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanavg_truncatednormal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanavg_truncatednormal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanavg_untruncatednormal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanavg_untruncatednormal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanavg_untruncatednormal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanavg_untruncatednormal_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanin_uniform_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanin_uniform_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanin_uniform_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanin_uniform_initializer.h5 diff --git a/tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanout_normal_initializer.h5 b/tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanout_normal_initializer.h5 similarity index 100% rename from tf-layer-loader/src/test/resources/edu/wpi/axon/tflayerloader/sequential_with_variancescaling_fanout_normal_initializer.h5 rename to tf-layer-loader/src/test/resources/edu/wpi/inndie/tflayerloader/sequential_with_variancescaling_fanout_normal_initializer.h5 diff --git a/training-test-util/src/main/kotlin/edu/wpi/axon/training/testutil/TrainTestUtil.kt b/training-test-util/src/main/kotlin/edu/wpi/inndie/training/testutil/TrainTestUtil.kt similarity index 91% rename from training-test-util/src/main/kotlin/edu/wpi/axon/training/testutil/TrainTestUtil.kt rename to training-test-util/src/main/kotlin/edu/wpi/inndie/training/testutil/TrainTestUtil.kt index df6f32f1..07505f3b 100644 --- a/training-test-util/src/main/kotlin/edu/wpi/axon/training/testutil/TrainTestUtil.kt +++ b/training-test-util/src/main/kotlin/edu/wpi/inndie/training/testutil/TrainTestUtil.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.training.testutil +package edu.wpi.inndie.training.testutil -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tflayerloader.ModelLoaderFactory -import edu.wpi.axon.util.runCommand +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tflayerloader.ModelLoaderFactory +import edu.wpi.inndie.util.runCommand import io.kotlintest.assertions.arrow.either.shouldBeRight import io.kotlintest.matchers.file.shouldExist import io.kotlintest.shouldBe diff --git a/training/src/main/kotlin/edu/wpi/axon/training/LoadedDataset.kt b/training/src/main/kotlin/edu/wpi/inndie/training/LoadedDataset.kt similarity index 87% rename from training/src/main/kotlin/edu/wpi/axon/training/LoadedDataset.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/LoadedDataset.kt index 6793d404..55e635fd 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/LoadedDataset.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/LoadedDataset.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None import arrow.core.Option -import edu.wpi.axon.dsl.variable.Variable +import edu.wpi.inndie.dsl.variable.Variable /** * Represents a dataset after it has been loaded into the script. diff --git a/training/src/main/kotlin/edu/wpi/axon/training/ModelDeploymentTarget.kt b/training/src/main/kotlin/edu/wpi/inndie/training/ModelDeploymentTarget.kt similarity index 97% rename from training/src/main/kotlin/edu/wpi/axon/training/ModelDeploymentTarget.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/ModelDeploymentTarget.kt index d25679d4..4ee3806e 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/ModelDeploymentTarget.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/ModelDeploymentTarget.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/training/src/main/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGenerator.kt b/training/src/main/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGenerator.kt similarity index 85% rename from training/src/main/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGenerator.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGenerator.kt index 35893284..6821b8b4 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGenerator.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGenerator.kt @@ -1,19 +1,19 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.NonEmptyList import arrow.core.Validated import arrow.core.invalidNel import arrow.fx.IO import com.google.common.base.Throwables -import edu.wpi.axon.dsl.ScriptGenerator -import edu.wpi.axon.dsl.container.DefaultPolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.creating -import edu.wpi.axon.dsl.runExactlyOnce -import edu.wpi.axon.dsl.running -import edu.wpi.axon.dsl.task.ApplyFunctionalLayerDeltaTask -import edu.wpi.axon.dsl.task.EnableEagerExecutionTask -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Model +import edu.wpi.inndie.dsl.ScriptGenerator +import edu.wpi.inndie.dsl.container.DefaultPolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.creating +import edu.wpi.inndie.dsl.runExactlyOnce +import edu.wpi.inndie.dsl.running +import edu.wpi.inndie.dsl.task.ApplyFunctionalLayerDeltaTask +import edu.wpi.inndie.dsl.task.EnableEagerExecutionTask +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Model import mu.KotlinLogging /** diff --git a/training/src/main/kotlin/edu/wpi/axon/training/TrainModelScriptGenerator.kt b/training/src/main/kotlin/edu/wpi/inndie/training/TrainModelScriptGenerator.kt similarity index 86% rename from training/src/main/kotlin/edu/wpi/axon/training/TrainModelScriptGenerator.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/TrainModelScriptGenerator.kt index ab14c49d..b3447f39 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/TrainModelScriptGenerator.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/TrainModelScriptGenerator.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.NonEmptyList import arrow.core.Validated -import edu.wpi.axon.tfdata.Model +import edu.wpi.inndie.tfdata.Model /** * Trains a [Model]. diff --git a/training/src/main/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGenerator.kt b/training/src/main/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGenerator.kt similarity index 86% rename from training/src/main/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGenerator.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGenerator.kt index 37598cd8..1ba56091 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGenerator.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGenerator.kt @@ -1,19 +1,19 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.NonEmptyList import arrow.core.Validated import arrow.core.invalidNel import arrow.fx.IO import com.google.common.base.Throwables -import edu.wpi.axon.dsl.ScriptGenerator -import edu.wpi.axon.dsl.container.DefaultPolymorphicNamedDomainObjectContainer -import edu.wpi.axon.dsl.creating -import edu.wpi.axon.dsl.runExactlyOnce -import edu.wpi.axon.dsl.running -import edu.wpi.axon.dsl.task.ApplySequentialLayerDeltaTask -import edu.wpi.axon.dsl.task.EnableEagerExecutionTask -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.tfdata.Model +import edu.wpi.inndie.dsl.ScriptGenerator +import edu.wpi.inndie.dsl.container.DefaultPolymorphicNamedDomainObjectContainer +import edu.wpi.inndie.dsl.creating +import edu.wpi.inndie.dsl.runExactlyOnce +import edu.wpi.inndie.dsl.running +import edu.wpi.inndie.dsl.task.ApplySequentialLayerDeltaTask +import edu.wpi.inndie.dsl.task.EnableEagerExecutionTask +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.tfdata.Model import mu.KotlinLogging /** diff --git a/training/src/main/kotlin/edu/wpi/axon/training/TrainState.kt b/training/src/main/kotlin/edu/wpi/inndie/training/TrainState.kt similarity index 70% rename from training/src/main/kotlin/edu/wpi/axon/training/TrainState.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/TrainState.kt index f907b581..dce5e3ad 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/TrainState.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/TrainState.kt @@ -1,14 +1,14 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.Option -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.allS3OrLocal -import edu.wpi.axon.util.getOutputModelName +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.allS3OrLocal +import edu.wpi.inndie.util.getOutputModelName import java.nio.file.Path /** @@ -47,12 +47,18 @@ data class TrainState( // Just need to check one because of the [require] below val usesAWS = userOldModelPath is FilePath.S3 - val trainedModelFilename = getOutputModelName(userOldModelPath.filename) + val trainedModelFilename = + getOutputModelName(userOldModelPath.filename) init { val s3Check = when (userDataset) { - is Dataset.ExampleDataset -> allS3OrLocal(userOldModelPath) - is Dataset.Custom -> allS3OrLocal(userOldModelPath, userDataset.path) + is Dataset.ExampleDataset -> allS3OrLocal( + userOldModelPath + ) + is Dataset.Custom -> allS3OrLocal( + userOldModelPath, + userDataset.path + ) } require(s3Check) { diff --git a/training/src/main/kotlin/edu/wpi/axon/training/TrainUtil.kt b/training/src/main/kotlin/edu/wpi/inndie/training/TrainUtil.kt similarity index 87% rename from training/src/main/kotlin/edu/wpi/axon/training/TrainUtil.kt rename to training/src/main/kotlin/edu/wpi/inndie/training/TrainUtil.kt index 5ce3efab..04a2889b 100644 --- a/training/src/main/kotlin/edu/wpi/axon/training/TrainUtil.kt +++ b/training/src/main/kotlin/edu/wpi/inndie/training/TrainUtil.kt @@ -1,35 +1,35 @@ @file:Suppress("UNUSED_VARIABLE") -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None import arrow.core.Some -import edu.wpi.axon.dsl.ScriptGenerator -import edu.wpi.axon.dsl.create -import edu.wpi.axon.dsl.creating -import edu.wpi.axon.dsl.run -import edu.wpi.axon.dsl.running -import edu.wpi.axon.dsl.task.CSVLoggerCallbackTask -import edu.wpi.axon.dsl.task.CheckpointCallbackTask -import edu.wpi.axon.dsl.task.CompileModelTask -import edu.wpi.axon.dsl.task.ConvertSuperviselyDatasetToRecord -import edu.wpi.axon.dsl.task.EarlyStoppingTask -import edu.wpi.axon.dsl.task.LoadExampleDatasetTask -import edu.wpi.axon.dsl.task.LoadModelTask -import edu.wpi.axon.dsl.task.LoadTFRecordOfImagesWithObjects -import edu.wpi.axon.dsl.task.PostTrainingQuantizationTask -import edu.wpi.axon.dsl.task.RunEdgeTpuCompilerTask -import edu.wpi.axon.dsl.task.RunPluginTask -import edu.wpi.axon.dsl.task.S3ProgressReportingCallbackTask -import edu.wpi.axon.dsl.task.SaveModelTask -import edu.wpi.axon.dsl.task.SliceTask -import edu.wpi.axon.dsl.task.Task -import edu.wpi.axon.dsl.task.TrainTask -import edu.wpi.axon.dsl.variable.Variable -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.util.trainingLogCsvFilename +import edu.wpi.inndie.dsl.ScriptGenerator +import edu.wpi.inndie.dsl.create +import edu.wpi.inndie.dsl.creating +import edu.wpi.inndie.dsl.run +import edu.wpi.inndie.dsl.running +import edu.wpi.inndie.dsl.task.CSVLoggerCallbackTask +import edu.wpi.inndie.dsl.task.CheckpointCallbackTask +import edu.wpi.inndie.dsl.task.CompileModelTask +import edu.wpi.inndie.dsl.task.ConvertSuperviselyDatasetToRecord +import edu.wpi.inndie.dsl.task.EarlyStoppingTask +import edu.wpi.inndie.dsl.task.LoadExampleDatasetTask +import edu.wpi.inndie.dsl.task.LoadModelTask +import edu.wpi.inndie.dsl.task.LoadTFRecordOfImagesWithObjects +import edu.wpi.inndie.dsl.task.PostTrainingQuantizationTask +import edu.wpi.inndie.dsl.task.RunEdgeTpuCompilerTask +import edu.wpi.inndie.dsl.task.RunPluginTask +import edu.wpi.inndie.dsl.task.S3ProgressReportingCallbackTask +import edu.wpi.inndie.dsl.task.SaveModelTask +import edu.wpi.inndie.dsl.task.SliceTask +import edu.wpi.inndie.dsl.task.Task +import edu.wpi.inndie.dsl.task.TrainTask +import edu.wpi.inndie.dsl.variable.Variable +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.util.trainingLogCsvFilename /** * Loads a model in to a variable using. Assumes the model is on disk. diff --git a/training/src/test/kotlin/edu/wpi/axon/training/Conv32321IntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/Conv32321IntegrationTest.kt similarity index 80% rename from training/src/test/kotlin/edu/wpi/axon/training/Conv32321IntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/Conv32321IntegrationTest.kt index 9a9d6328..2c70ef85 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/Conv32321IntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/Conv32321IntegrationTest.kt @@ -1,18 +1,18 @@ @file:SuppressWarnings("LongMethod", "LargeClass") -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.plugin.DatasetPlugins.processMnistTypePlugin -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.testutil.loadModel -import edu.wpi.axon.training.testutil.testTrainingScript -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.plugin.DatasetPlugins.processMnistTypePlugin +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.testutil.loadModel +import edu.wpi.inndie.training.testutil.testTrainingScript +import edu.wpi.inndie.util.FilePath import io.kotlintest.assertions.arrow.validation.shouldBeValid import io.kotlintest.matchers.types.shouldBeInstanceOf import java.io.File @@ -53,7 +53,11 @@ internal class Conv32321IntegrationTest : KoinTestFixture() { ), it ).generateScript().shouldBeValid { (script) -> - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) } } } @@ -87,7 +91,11 @@ internal class Conv32321IntegrationTest : KoinTestFixture() { ), it ).generateScript().shouldBeValid { (script) -> - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) } } } diff --git a/training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-14-IntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-14-IntegrationTest.kt similarity index 79% rename from training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-14-IntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-14-IntegrationTest.kt index 0ce59ed5..91483569 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-14-IntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-14-IntegrationTest.kt @@ -1,17 +1,17 @@ @file:SuppressWarnings("LongMethod", "LargeClass") -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.testutil.loadModel -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.plugin.DatasetPlugins +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.testutil.loadModel +import edu.wpi.inndie.util.FilePath import io.kotlintest.assertions.arrow.validation.shouldBeValid import io.kotlintest.matchers.types.shouldBeInstanceOf import java.nio.file.Path diff --git a/training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-15-IntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-15-IntegrationTest.kt similarity index 81% rename from training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-15-IntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-15-IntegrationTest.kt index 44cb7d2e..52c4c98a 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/Mobilenet-v-1-15-IntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/Mobilenet-v-1-15-IntegrationTest.kt @@ -1,14 +1,14 @@ @file:SuppressWarnings("LongMethod", "LargeClass") -package edu.wpi.axon.training +package edu.wpi.inndie.training -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.layer.Activation -import edu.wpi.axon.tfdata.layer.DataFormat -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.training.testutil.loadModel +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.layer.Activation +import edu.wpi.inndie.tfdata.layer.DataFormat +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.training.testutil.loadModel import io.kotlintest.matchers.collections.shouldHaveSize import io.kotlintest.matchers.types.shouldBeInstanceOf import io.kotlintest.shouldBe diff --git a/training/src/test/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt similarity index 92% rename from training/src/test/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt index 4d8de015..22240fe7 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/TrainGeneralModelScriptGeneratorIntegrationTest.kt @@ -1,17 +1,17 @@ @file:SuppressWarnings("LongMethod", "LargeClass") -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.testutil.loadModel -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.plugin.DatasetPlugins +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.testutil.loadModel +import edu.wpi.inndie.util.FilePath import io.kotlintest.assertions.arrow.validation.shouldBeValid import io.kotlintest.matchers.types.shouldBeInstanceOf import java.io.File diff --git a/training/src/test/kotlin/edu/wpi/axon/training/TrainIntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/TrainIntegrationTest.kt similarity index 85% rename from training/src/test/kotlin/edu/wpi/axon/training/TrainIntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/TrainIntegrationTest.kt index e7e76880..bf2ebdd1 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/TrainIntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/TrainIntegrationTest.kt @@ -1,15 +1,15 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.testutil.loadModel -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.plugin.DatasetPlugins +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.testutil.loadModel +import edu.wpi.inndie.util.FilePath import io.kotlintest.assertions.arrow.validation.shouldBeInvalid import io.kotlintest.assertions.arrow.validation.shouldBeValid import io.kotlintest.matchers.types.shouldBeInstanceOf @@ -89,9 +89,11 @@ internal class TrainIntegrationTest : KoinTestFixture() { TrainGeneralModelScriptGenerator( TrainState( - userOldModelPath = FilePath.Local(Paths.get( - this::class.java.getResource("badModel1.h5").toURI() - ).toString()), + userOldModelPath = FilePath.Local( + Paths.get( + this::class.java.getResource("badModel1.h5").toURI() + ).toString() + ), userDataset = Dataset.ExampleDataset.Mnist, userOptimizer = Optimizer.Adam(0.001, 0.9, 0.999, 1e-7, false), userLoss = Loss.SparseCategoricalCrossentropy, diff --git a/training/src/test/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt similarity index 85% rename from training/src/test/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt index 36a162ac..aaf05caa 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/TrainSequentialModelScriptGeneratorIntegrationTest.kt @@ -1,22 +1,21 @@ @file:SuppressWarnings("LongMethod", "LargeClass") -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.dsl.task.RunEdgeTpuCompilerTask -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.plugin.DatasetPlugins.datasetPassthroughPlugin -import edu.wpi.axon.plugin.DatasetPlugins.processMnistTypePlugin -import edu.wpi.axon.testutil.KoinTestFixture -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.testutil.loadModel -import edu.wpi.axon.training.testutil.testTrainingScript -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.axonBucketName +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.dsl.task.RunEdgeTpuCompilerTask +import edu.wpi.inndie.plugin.DatasetPlugins.datasetPassthroughPlugin +import edu.wpi.inndie.plugin.DatasetPlugins.processMnistTypePlugin +import edu.wpi.inndie.testutil.KoinTestFixture +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.testutil.loadModel +import edu.wpi.inndie.training.testutil.testTrainingScript +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.inndieBucketName import io.kotlintest.assertions.arrow.validation.shouldBeValid import io.kotlintest.matchers.file.shouldExist import io.kotlintest.matchers.types.shouldBeInstanceOf @@ -41,7 +40,7 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt listOf( defaultBackendModule(), module { - single(named(axonBucketName)) { "dummy-bucket-name" } + single(named(inndieBucketName)) { "dummy-bucket-name" } } ) ) @@ -74,7 +73,11 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt ), it ).generateScript().shouldBeValid { (script) -> - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) } } } @@ -87,7 +90,7 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt listOf( defaultBackendModule(), module { - single(named(axonBucketName)) { "dummy-bucket-name" } + single(named(inndieBucketName)) { "dummy-bucket-name" } } ) ) @@ -120,7 +123,11 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt ), it ).generateScript().shouldBeValid { (script) -> - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) } } } @@ -166,7 +173,11 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt ).generateScript().shouldBeValid { (script) -> Paths.get(this::class.java.getResource("WPILib_reduced.tar").toURI()).toFile() .copyTo(Paths.get(tempDir.absolutePath, "WPILib_reduced.tar").toFile()) - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) } } } @@ -205,14 +216,18 @@ internal class TrainSequentialModelScriptGeneratorIntegrationTest : KoinTestFixt generateDebugComments = false, target = ModelDeploymentTarget.Coral(0.0001), workingDir = tempDir.toPath(), - datasetPlugin = DatasetPlugins.datasetPassthroughPlugin, + datasetPlugin = datasetPassthroughPlugin, jobId = Random.nextInt(1, Int.MAX_VALUE) ), it ).generateScript().shouldBeValid { (script) -> Paths.get(this::class.java.getResource("WPILib_reduced.tar").toURI()).toFile() .copyTo(Paths.get(tempDir.absolutePath, "WPILib_reduced.tar").toFile()) - testTrainingScript(tempDir, script, newModelName) + testTrainingScript( + tempDir, + script, + newModelName + ) // Also test for the compiled output tempDir.toPath().resolve( RunEdgeTpuCompilerTask.getEdgeTpuCompiledModelFilename(newModelName) diff --git a/training/src/test/kotlin/edu/wpi/axon/training/TrainStateTest.kt b/training/src/test/kotlin/edu/wpi/inndie/training/TrainStateTest.kt similarity index 90% rename from training/src/test/kotlin/edu/wpi/axon/training/TrainStateTest.kt rename to training/src/test/kotlin/edu/wpi/inndie/training/TrainStateTest.kt index 8eb43c23..00d0e971 100644 --- a/training/src/test/kotlin/edu/wpi/axon/training/TrainStateTest.kt +++ b/training/src/test/kotlin/edu/wpi/inndie/training/TrainStateTest.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.training +package edu.wpi.inndie.training import arrow.core.None -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.plugin.DatasetPlugins +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.util.FilePath import io.kotlintest.matchers.booleans.shouldBeFalse import io.kotlintest.matchers.booleans.shouldBeTrue import io.mockk.mockk diff --git a/training/src/test/resources/edu/wpi/axon/training/32_32_1_conv_general.h5 b/training/src/test/resources/edu/wpi/inndie/training/32_32_1_conv_general.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/32_32_1_conv_general.h5 rename to training/src/test/resources/edu/wpi/inndie/training/32_32_1_conv_general.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/32_32_1_conv_sequential.h5 b/training/src/test/resources/edu/wpi/inndie/training/32_32_1_conv_sequential.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/32_32_1_conv_sequential.h5 rename to training/src/test/resources/edu/wpi/inndie/training/32_32_1_conv_sequential.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/WPILib_reduced.tar b/training/src/test/resources/edu/wpi/inndie/training/WPILib_reduced.tar similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/WPILib_reduced.tar rename to training/src/test/resources/edu/wpi/inndie/training/WPILib_reduced.tar diff --git a/training/src/test/resources/edu/wpi/axon/training/badModel1.h5 b/training/src/test/resources/edu/wpi/inndie/training/badModel1.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/badModel1.h5 rename to training/src/test/resources/edu/wpi/inndie/training/badModel1.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/custom_fashion_mnist.h5 b/training/src/test/resources/edu/wpi/inndie/training/custom_fashion_mnist.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/custom_fashion_mnist.h5 rename to training/src/test/resources/edu/wpi/inndie/training/custom_fashion_mnist.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/mobilenet_tf_1_15_0.h5 b/training/src/test/resources/edu/wpi/inndie/training/mobilenet_tf_1_15_0.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/mobilenet_tf_1_15_0.h5 rename to training/src/test/resources/edu/wpi/inndie/training/mobilenet_tf_1_15_0.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/mobilenetv2_1.00_224.h5 b/training/src/test/resources/edu/wpi/inndie/training/mobilenetv2_1.00_224.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/mobilenetv2_1.00_224.h5 rename to training/src/test/resources/edu/wpi/inndie/training/mobilenetv2_1.00_224.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/mobilenetv2_tf-1-15.h5 b/training/src/test/resources/edu/wpi/inndie/training/mobilenetv2_tf-1-15.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/mobilenetv2_tf-1-15.h5 rename to training/src/test/resources/edu/wpi/inndie/training/mobilenetv2_tf-1-15.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/network_with_add.h5 b/training/src/test/resources/edu/wpi/inndie/training/network_with_add.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/network_with_add.h5 rename to training/src/test/resources/edu/wpi/inndie/training/network_with_add.h5 diff --git a/training/src/test/resources/edu/wpi/axon/training/small_model_for_wpilib_reduced_dataset.h5 b/training/src/test/resources/edu/wpi/inndie/training/small_model_for_wpilib_reduced_dataset.h5 similarity index 100% rename from training/src/test/resources/edu/wpi/axon/training/small_model_for_wpilib_reduced_dataset.h5 rename to training/src/test/resources/edu/wpi/inndie/training/small_model_for_wpilib_reduced_dataset.h5 diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobLifecycleManager.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobLifecycleManager.kt similarity index 92% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobLifecycleManager.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobLifecycleManager.kt index d2fe16df..bb742a99 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobLifecycleManager.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobLifecycleManager.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.ui +package edu.wpi.inndie.ui -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.db.data.DesiredJobTrainingMethod -import edu.wpi.axon.db.data.Job -import edu.wpi.axon.db.data.TrainingScriptProgress +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.db.data.DesiredJobTrainingMethod +import edu.wpi.inndie.db.data.Job +import edu.wpi.inndie.db.data.TrainingScriptProgress import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel @@ -34,7 +34,7 @@ class JobLifecycleManager internal constructor( /** * Synchronizes the state of this manager with the database. Resumes progress tracking for any - * Jobs that were running when Axon was last closed. + * Jobs that were running when INNDiE was last closed. */ fun initialize() { val runningJobs = jobDb.fetchRunningJobs() @@ -117,7 +117,9 @@ class JobLifecycleManager internal constructor( // If the Job job is active, then it should start the Job eventually, so we can keep // polling here without risk of an infinite loop. if (jobRunner.cancelJob(id)) { - jobJob.cancel("Cancelled by user.", JobCancelledByUserException()) + jobJob.cancel("Cancelled by user.", + JobCancelledByUserException() + ) break } else { delay(500L) diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobRunner.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobRunner.kt similarity index 75% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobRunner.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobRunner.kt index 294b93aa..dda964ea 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/JobRunner.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/JobRunner.kt @@ -1,38 +1,38 @@ -package edu.wpi.axon.ui +package edu.wpi.inndie.ui import arrow.core.None import arrow.core.Option import arrow.core.Some import arrow.fx.IO -import edu.wpi.axon.aws.EC2Manager -import edu.wpi.axon.aws.EC2TrainingResultSupplier -import edu.wpi.axon.aws.EC2TrainingScriptCanceller -import edu.wpi.axon.aws.EC2TrainingScriptProgressReporter -import edu.wpi.axon.aws.EC2TrainingScriptRunner -import edu.wpi.axon.aws.LocalTrainingResultSupplier -import edu.wpi.axon.aws.LocalTrainingScriptCanceller -import edu.wpi.axon.aws.LocalTrainingScriptProgressReporter -import edu.wpi.axon.aws.LocalTrainingScriptRunner -import edu.wpi.axon.aws.RunTrainingScriptConfiguration -import edu.wpi.axon.aws.S3Manager -import edu.wpi.axon.aws.TrainingResultSupplier -import edu.wpi.axon.aws.TrainingScriptCanceller -import edu.wpi.axon.aws.TrainingScriptProgressReporter -import edu.wpi.axon.aws.TrainingScriptRunner -import edu.wpi.axon.aws.preferences.PreferencesManager -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.db.data.DesiredJobTrainingMethod -import edu.wpi.axon.db.data.InternalJobTrainingMethod -import edu.wpi.axon.db.data.Job -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.training.TrainGeneralModelScriptGenerator -import edu.wpi.axon.training.TrainSequentialModelScriptGenerator -import edu.wpi.axon.training.TrainState -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.axonBucketName -import edu.wpi.axon.util.getLocalTrainingScriptRunnerWorkingDir +import edu.wpi.inndie.aws.EC2Manager +import edu.wpi.inndie.aws.EC2TrainingResultSupplier +import edu.wpi.inndie.aws.EC2TrainingScriptCanceller +import edu.wpi.inndie.aws.EC2TrainingScriptProgressReporter +import edu.wpi.inndie.aws.EC2TrainingScriptRunner +import edu.wpi.inndie.aws.LocalTrainingResultSupplier +import edu.wpi.inndie.aws.LocalTrainingScriptCanceller +import edu.wpi.inndie.aws.LocalTrainingScriptProgressReporter +import edu.wpi.inndie.aws.LocalTrainingScriptRunner +import edu.wpi.inndie.aws.RunTrainingScriptConfiguration +import edu.wpi.inndie.aws.S3Manager +import edu.wpi.inndie.aws.TrainingResultSupplier +import edu.wpi.inndie.aws.TrainingScriptCanceller +import edu.wpi.inndie.aws.TrainingScriptProgressReporter +import edu.wpi.inndie.aws.TrainingScriptRunner +import edu.wpi.inndie.aws.preferences.PreferencesManager +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.db.data.DesiredJobTrainingMethod +import edu.wpi.inndie.db.data.InternalJobTrainingMethod +import edu.wpi.inndie.db.data.Job +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.training.TrainGeneralModelScriptGenerator +import edu.wpi.inndie.training.TrainSequentialModelScriptGenerator +import edu.wpi.inndie.training.TrainState +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.getLocalTrainingScriptRunnerWorkingDir +import edu.wpi.inndie.util.inndieBucketName import java.nio.file.Path import java.nio.file.Paths import kotlinx.coroutines.delay @@ -51,7 +51,7 @@ internal class JobRunner : KoinComponent { private val progressReporters = mutableMapOf() private val cancellers = mutableMapOf() private val resultSuppliers = mutableMapOf() - private val bucketName by inject>(named(axonBucketName)) + private val bucketName by inject>(named(inndieBucketName)) private val modelManager by inject() private val jobDb by inject() @@ -90,7 +90,8 @@ internal class JobRunner : KoinComponent { } private fun startLocalJob(job: Job) { - val workingDir = getLocalTrainingScriptRunnerWorkingDir(job.id) + val workingDir = + getLocalTrainingScriptRunnerWorkingDir(job.id) val config = generateScriptAndCreateConfig(job, workingDir) val scriptRunner = LocalTrainingScriptRunner().apply { startScript(config) } @@ -186,9 +187,15 @@ internal class JobRunner : KoinComponent { null } else { val newSupplier = when (job.internalTrainingMethod) { - is InternalJobTrainingMethod.EC2 -> EC2TrainingResultSupplier(S3Manager(getBucket())) + is InternalJobTrainingMethod.EC2 -> EC2TrainingResultSupplier( + S3Manager(getBucket()) + ) is InternalJobTrainingMethod.Local -> LocalTrainingResultSupplier().apply { - addJob(id, getLocalTrainingScriptRunnerWorkingDir(id)) + addJob(id, + getLocalTrainingScriptRunnerWorkingDir( + id + ) + ) } else -> null } @@ -230,7 +237,7 @@ internal class JobRunner : KoinComponent { } /** - * Starts progress reporting after Axon has been restarted. After calling this, it's safe to + * Starts progress reporting after INNDiE has been restarted. After calling this, it's safe to * call [waitForFinish] to resume tracking progress updates for a Job. * * @param job The Job. @@ -243,15 +250,21 @@ internal class JobRunner : KoinComponent { val ec2Manager = EC2Manager() val s3Manager = S3Manager(getBucket()) progressReporters[job.id] = - EC2TrainingScriptProgressReporter(ec2Manager, s3Manager).apply { + EC2TrainingScriptProgressReporter( + ec2Manager, + s3Manager + ).apply { addJob(job.id, trainingMethod.instanceId, job.userEpochs) } - cancellers[job.id] = EC2TrainingScriptCanceller(ec2Manager).apply { + cancellers[job.id] = EC2TrainingScriptCanceller( + ec2Manager + ).apply { addJob(job.id, trainingMethod.instanceId) } - resultSuppliers[job.id] = EC2TrainingResultSupplier(s3Manager) + resultSuppliers[job.id] = + EC2TrainingResultSupplier(s3Manager) } is InternalJobTrainingMethod.Local -> { @@ -262,7 +275,9 @@ internal class JobRunner : KoinComponent { job, FilePath.Local(""), "", - getLocalTrainingScriptRunnerWorkingDir(job.id) + getLocalTrainingScriptRunnerWorkingDir( + job.id + ) ) progressReporters[job.id] = LocalTrainingScriptProgressReporter().apply { @@ -286,7 +301,7 @@ internal class JobRunner : KoinComponent { } private fun getBucket(): String { - val bucket = get>(named(axonBucketName)) + val bucket = get>(named(inndieBucketName)) check(bucket is Some) { "Tried to create an EC2TrainingScriptRunner but did not have a bucket configured." } @@ -312,23 +327,24 @@ internal class JobRunner : KoinComponent { job: Job, modelPath: FilePath, workingDir: Path - ): TrainState = TrainState( - userOldModelPath = modelPath, - userDataset = job.userDataset, - userOptimizer = job.userOptimizer, - userLoss = job.userLoss, - userMetrics = job.userMetrics, - userEpochs = job.userEpochs, - // TODO: Add userValidationSplit to Job and pull it from there so that the user can - // configure it - userValidationSplit = None, - userNewModel = job.userNewModel as T, - generateDebugComments = job.generateDebugComments, - target = job.target, - workingDir = workingDir, - datasetPlugin = job.datasetPlugin, - jobId = job.id - ) + ): TrainState = + TrainState( + userOldModelPath = modelPath, + userDataset = job.userDataset, + userOptimizer = job.userOptimizer, + userLoss = job.userLoss, + userMetrics = job.userMetrics, + userEpochs = job.userEpochs, + // TODO: Add userValidationSplit to Job and pull it from there so that the user can + // configure it + userValidationSplit = None, + userNewModel = job.userNewModel as T, + generateDebugComments = job.generateDebugComments, + target = job.target, + workingDir = workingDir, + datasetPlugin = job.datasetPlugin, + jobId = job.id + ) companion object { private val LOGGER = KotlinLogging.logger { } diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/ModelManager.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/ModelManager.kt similarity index 83% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/ModelManager.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/ModelManager.kt index 2994bef3..564a8148 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/ModelManager.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/ModelManager.kt @@ -1,14 +1,14 @@ -package edu.wpi.axon.ui +package edu.wpi.inndie.ui import arrow.core.Option import arrow.core.getOrElse -import edu.wpi.axon.aws.S3Manager -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tflayerloader.ModelLoaderFactory -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.axonBucketName +import edu.wpi.inndie.aws.S3Manager +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tflayerloader.ModelLoaderFactory +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.inndieBucketName import java.io.File import org.koin.core.KoinComponent import org.koin.core.inject @@ -16,7 +16,7 @@ import org.koin.core.qualifier.named class ModelManager : KoinComponent { - private val bucketName by inject>(named(axonBucketName)) + private val bucketName by inject>(named(inndieBucketName)) private val s3Manager by lazy { bucketName.map { S3Manager(it) } } private val exampleModelManager by inject() diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/JobBoard.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/JobBoard.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/JobBoard.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/JobBoard.kt index 6fc02d8e..4e7eb52b 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/JobBoard.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/JobBoard.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.ui.controller +package edu.wpi.inndie.ui.controller -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.db.JobDbOp -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.ui.model.JobDto -import edu.wpi.axon.ui.model.ModelSourceType +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.db.JobDbOp +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.ui.model.JobDto +import edu.wpi.inndie.ui.model.ModelSourceType import javafx.application.Platform import tornadofx.Controller import tornadofx.asObservable diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/PluginStore.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/PluginStore.kt similarity index 79% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/PluginStore.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/PluginStore.kt index 363e029c..8016760f 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/PluginStore.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/PluginStore.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.ui.controller +package edu.wpi.inndie.ui.controller -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.plugin.PluginManager -import edu.wpi.axon.util.datasetPluginManagerName -import edu.wpi.axon.util.loadTestDataPluginManagerName -import edu.wpi.axon.util.processTestOutputPluginManagerName +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.plugin.PluginManager +import edu.wpi.inndie.util.datasetPluginManagerName +import edu.wpi.inndie.util.loadTestDataPluginManagerName +import edu.wpi.inndie.util.processTestOutputPluginManagerName import tornadofx.Controller import tornadofx.SortedFilteredList diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/WizardTaskService.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/WizardTaskService.kt similarity index 87% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/WizardTaskService.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/WizardTaskService.kt index 232e3541..721d6433 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/controller/WizardTaskService.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/controller/WizardTaskService.kt @@ -1,13 +1,13 @@ -package edu.wpi.axon.ui.controller +package edu.wpi.inndie.ui.controller -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.ui.model.DatasetType -import edu.wpi.axon.ui.model.TaskInput -import edu.wpi.axon.ui.model.WizardTarget -import edu.wpi.axon.ui.model.WizardTask +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.ui.model.DatasetType +import edu.wpi.inndie.ui.model.TaskInput +import edu.wpi.inndie.ui.model.WizardTarget +import edu.wpi.inndie.ui.model.WizardTask import javafx.collections.FXCollections import javafx.collections.ObservableList import tornadofx.Controller diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/FrontendKoinModules.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/FrontendKoinModules.kt similarity index 68% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/FrontendKoinModules.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/FrontendKoinModules.kt index ac59d2c0..447c4fb9 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/FrontendKoinModules.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/FrontendKoinModules.kt @@ -1,46 +1,46 @@ -package edu.wpi.axon.ui.main +package edu.wpi.inndie.ui.main import arrow.core.None import arrow.core.Option import arrow.core.Some -import edu.wpi.axon.aws.S3Manager -import edu.wpi.axon.aws.S3PreferencesManager -import edu.wpi.axon.aws.findAxonS3Bucket -import edu.wpi.axon.aws.plugin.S3PluginManager -import edu.wpi.axon.aws.preferences.LocalPreferencesManager -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.examplemodel.GitExampleModelManager -import edu.wpi.axon.plugin.DatasetPlugins.datasetPassthroughPlugin -import edu.wpi.axon.plugin.DatasetPlugins.divideByTwoFiveFivePlugin -import edu.wpi.axon.plugin.DatasetPlugins.processMnistTypeForMobilenetPlugin -import edu.wpi.axon.plugin.DatasetPlugins.processMnistTypePlugin -import edu.wpi.axon.plugin.LoadTestDataPlugins.loadExampleDatasetPlugin -import edu.wpi.axon.plugin.LocalPluginManager -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.plugin.PluginManager -import edu.wpi.axon.plugin.ProcessTestOutputPlugins.autoMpgRegressionOutputPlugin -import edu.wpi.axon.plugin.ProcessTestOutputPlugins.imageClassificationModelOutputPlugin -import edu.wpi.axon.ui.JobLifecycleManager -import edu.wpi.axon.ui.JobRunner -import edu.wpi.axon.ui.ModelManager -import edu.wpi.axon.util.axonBucketName -import edu.wpi.axon.util.datasetPluginManagerName -import edu.wpi.axon.util.loadTestDataPluginManagerName -import edu.wpi.axon.util.localCacheDir -import edu.wpi.axon.util.processTestOutputPluginManagerName +import edu.wpi.inndie.aws.S3Manager +import edu.wpi.inndie.aws.S3PreferencesManager +import edu.wpi.inndie.aws.findINNDiES3Bucket +import edu.wpi.inndie.aws.plugin.S3PluginManager +import edu.wpi.inndie.aws.preferences.LocalPreferencesManager +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.examplemodel.GitExampleModelManager +import edu.wpi.inndie.plugin.DatasetPlugins.datasetPassthroughPlugin +import edu.wpi.inndie.plugin.DatasetPlugins.divideByTwoFiveFivePlugin +import edu.wpi.inndie.plugin.DatasetPlugins.processMnistTypeForMobilenetPlugin +import edu.wpi.inndie.plugin.DatasetPlugins.processMnistTypePlugin +import edu.wpi.inndie.plugin.LoadTestDataPlugins.loadExampleDatasetPlugin +import edu.wpi.inndie.plugin.LocalPluginManager +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.plugin.PluginManager +import edu.wpi.inndie.plugin.ProcessTestOutputPlugins.autoMpgRegressionOutputPlugin +import edu.wpi.inndie.plugin.ProcessTestOutputPlugins.imageClassificationModelOutputPlugin +import edu.wpi.inndie.ui.JobLifecycleManager +import edu.wpi.inndie.ui.JobRunner +import edu.wpi.inndie.ui.ModelManager +import edu.wpi.inndie.util.datasetPluginManagerName +import edu.wpi.inndie.util.inndieBucketName +import edu.wpi.inndie.util.loadTestDataPluginManagerName +import edu.wpi.inndie.util.localCacheDir +import edu.wpi.inndie.util.processTestOutputPluginManagerName import org.jetbrains.exposed.sql.Database import org.koin.core.qualifier.named import org.koin.core.scope.Scope import org.koin.dsl.module fun defaultFrontendModule() = module { - single(qualifier = named(axonBucketName), createdAtStart = true) { findAxonS3Bucket() } + single(qualifier = named(inndieBucketName), createdAtStart = true) { findINNDiES3Bucket() } single { JobDb( Database.connect( - url = "jdbc:h2:~/.wpilib/Axon/db;DB_CLOSE_DELAY=-1", + url = "jdbc:h2:~/.wpilib/INNDiE/db;DB_CLOSE_DELAY=-1", driver = "org.h2.Driver" ) ).apply { @@ -88,7 +88,7 @@ fun defaultFrontendModule() = module { } single { - when (val bucketName = get>(named(axonBucketName))) { + when (val bucketName = get>(named(inndieBucketName))) { is Some -> S3PreferencesManager(S3Manager(bucketName.t)).apply { initialize() } is None -> LocalPreferencesManager( localCacheDir.resolve("preferences.json") @@ -105,7 +105,7 @@ fun defaultFrontendModule() = module { processMnistTypeForMobilenetPlugin, divideByTwoFiveFivePlugin ), - "axon-dataset-plugins", + "inndie-dataset-plugins", "dataset_plugin_cache.json" ) } @@ -115,7 +115,7 @@ fun defaultFrontendModule() = module { setOf( loadExampleDatasetPlugin ), - "axon-load-test-data-plugins", + "inndie-load-test-data-plugins", "load_test_data_plugin_cache.json" ) } @@ -126,7 +126,7 @@ fun defaultFrontendModule() = module { imageClassificationModelOutputPlugin, autoMpgRegressionOutputPlugin ), - "axon-process-test-output-plugins", + "inndie-process-test-output-plugins", "process_test_output_plugin_cache.json" ) } @@ -142,14 +142,15 @@ fun defaultFrontendModule() = module { single { ModelManager() } single { JobRunner() } - single { GitExampleModelManager().apply { updateCache().unsafeRunSync() } } + single { GitExampleModelManager() + .apply { updateCache().unsafeRunSync() } } } private fun Scope.bindPluginManager( officialPlugins: Set, cacheName: String, cacheFileName: String -): PluginManager = when (val bucketName = get>(named(axonBucketName))) { +): PluginManager = when (val bucketName = get>(named(inndieBucketName))) { is Some -> { S3PluginManager( S3Manager(bucketName.t), diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/Axon.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/INNDiE.kt similarity index 87% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/Axon.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/INNDiE.kt index ed578752..f692fbaa 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/main/Axon.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/main/INNDiE.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.main +package edu.wpi.inndie.ui.main -import edu.wpi.axon.dsl.defaultBackendModule -import edu.wpi.axon.ui.view.Main +import edu.wpi.inndie.dsl.defaultBackendModule +import edu.wpi.inndie.ui.view.Main import kotlin.reflect.KClass import org.koin.core.KoinComponent import org.koin.core.context.startKoin @@ -10,7 +10,7 @@ import tornadofx.App import tornadofx.DIContainer import tornadofx.FX -class Axon : App(Main::class) { +class INNDiE : App(Main::class) { init { startKoin { modules( @@ -34,7 +34,7 @@ class Axon : App(Main::class) { companion object { fun main() { - tornadofx.launch() + tornadofx.launch() } } } diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/AdamModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/AdamModel.kt similarity index 94% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/AdamModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/AdamModel.kt index d13f2789..076fab6b 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/AdamModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/AdamModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.optimizer.Optimizer import javafx.beans.property.Property import javafx.beans.property.SimpleBooleanProperty import javafx.beans.property.SimpleDoubleProperty diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/CoralModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/CoralModel.kt similarity index 90% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/CoralModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/CoralModel.kt index 1a63d58e..4a968fce 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/CoralModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/CoralModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.training.ModelDeploymentTarget +import edu.wpi.inndie.training.ModelDeploymentTarget import javafx.beans.property.Property import javafx.beans.property.SimpleDoubleProperty import tornadofx.ItemViewModel diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Dataset.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Dataset.kt similarity index 87% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Dataset.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Dataset.kt index 92ab2b31..aeb3a9fc 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Dataset.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Dataset.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.tfdata.Dataset +import edu.wpi.inndie.tfdata.Dataset import javafx.beans.property.SimpleObjectProperty import tornadofx.ItemViewModel diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/FTRLModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/FTRLModel.kt similarity index 96% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/FTRLModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/FTRLModel.kt index 4d22be6c..1f881d79 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/FTRLModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/FTRLModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.optimizer.Optimizer import javafx.beans.property.Property import javafx.beans.property.SimpleDoubleProperty import tornadofx.ItemViewModel diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Job.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Job.kt similarity index 91% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Job.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Job.kt index bda924d6..6da04feb 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/Job.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/Job.kt @@ -1,21 +1,21 @@ -package edu.wpi.axon.ui.model - -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.db.data.InternalJobTrainingMethod -import edu.wpi.axon.db.data.Job -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.plugin.DatasetPlugins -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.ui.ModelManager -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.getOutputModelName +package edu.wpi.inndie.ui.model + +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.db.data.InternalJobTrainingMethod +import edu.wpi.inndie.db.data.Job +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.plugin.DatasetPlugins +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.ui.ModelManager +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.getOutputModelName import javafx.beans.property.SimpleIntegerProperty import javafx.beans.property.SimpleObjectProperty import javafx.beans.property.SimpleSetProperty @@ -131,7 +131,9 @@ class JobModel : ItemViewModel() { userMetrics = userMetrics.value, userEpochs = userEpochs.value.toInt(), userNewModel = userNewModel.value, - userNewModelFilename = FilePath.Local(getOutputModelName(userOldModelPath.value.filename)), + userNewModelFilename = FilePath.Local( + getOutputModelName(userOldModelPath.value.filename) + ), target = target.value, datasetPlugin = datasetPlugin.value ) @@ -190,7 +192,8 @@ class JobWizardModel : ItemViewModel() { lossType.value = taskInput.value.loss::class userMetrics.value = setOf("accuracy").toObservable() userNewModel.value = modelManager.loadModel(modelSource) - userNewModelFilename.value = getOutputModelName(modelSource.filename) + userNewModelFilename.value = + getOutputModelName(modelSource.filename) internalTrainingMethod.value = InternalJobTrainingMethod.Untrained targetType.value = wizardTarget.value.targetClass target.value = when (targetType.value) { diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/ModelSourceType.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/ModelSourceType.kt similarity index 60% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/ModelSourceType.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/ModelSourceType.kt index ffcfd306..aa55bac4 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/ModelSourceType.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/ModelSourceType.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model enum class ModelSourceType { EXAMPLE, FILE diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PluginModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PluginModel.kt similarity index 86% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PluginModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PluginModel.kt index 34b2c865..ec74aa5a 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PluginModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PluginModel.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.ui.controller.PluginStore +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.ui.controller.PluginStore import javafx.beans.property.ReadOnlyBooleanProperty import javafx.beans.property.SimpleBooleanProperty import javafx.beans.property.SimpleStringProperty diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PreferencesModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PreferencesModel.kt similarity index 84% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PreferencesModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PreferencesModel.kt index 89ba940a..b07d1b57 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/PreferencesModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/PreferencesModel.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.aws.preferences.Preferences -import edu.wpi.axon.aws.preferences.PreferencesManager +import edu.wpi.inndie.aws.preferences.Preferences +import edu.wpi.inndie.aws.preferences.PreferencesManager import javafx.beans.property.SimpleLongProperty import javafx.beans.property.SimpleObjectProperty import tornadofx.ItemViewModel diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/RMSpropModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/RMSpropModel.kt similarity index 94% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/RMSpropModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/RMSpropModel.kt index a1a42ef1..1c47a434 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/RMSpropModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/RMSpropModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.tfdata.optimizer.Optimizer +import edu.wpi.inndie.tfdata.optimizer.Optimizer import javafx.beans.property.Property import javafx.beans.property.SimpleBooleanProperty import javafx.beans.property.SimpleDoubleProperty diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/WizardTask.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/WizardTask.kt similarity index 72% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/WizardTask.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/WizardTask.kt index b03a135a..b0766854 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/model/WizardTask.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/model/WizardTask.kt @@ -1,9 +1,9 @@ -package edu.wpi.axon.ui.model +package edu.wpi.inndie.ui.model -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget import kotlin.reflect.KClass data class TaskInput(val title: String = "", val description: String = "", val graphic: String? = null, val datasetType: DatasetType, val dataset: Dataset, val optimizer: Optimizer, val loss: Loss) diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/About.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/About.kt similarity index 75% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/About.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/About.kt index d5faabab..3018e53f 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/About.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/About.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view +package edu.wpi.inndie.ui.view import tornadofx.View import tornadofx.text @@ -7,6 +7,6 @@ import tornadofx.vbox class About : View() { override val root = vbox { setMinSize(400.0, 400.0) - text("Axon") + text("INNDiE") } } diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/ContentMap.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/ContentMap.kt similarity index 97% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/ContentMap.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/ContentMap.kt index 35c755ae..89aea492 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/ContentMap.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/ContentMap.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view +package edu.wpi.inndie.ui.view import javafx.beans.property.ObjectProperty import javafx.beans.property.Property diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/JobManager.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/JobManager.kt similarity index 70% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/JobManager.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/JobManager.kt index 1c2a39d8..2138a618 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/JobManager.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/JobManager.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.ui.view +package edu.wpi.inndie.ui.view -import edu.wpi.axon.ui.view.jobeditor.JobEditor -import edu.wpi.axon.ui.view.jobresult.JobResultsView -import edu.wpi.axon.ui.view.jobtestview.JobTestView +import edu.wpi.inndie.ui.view.jobeditor.JobEditor +import edu.wpi.inndie.ui.view.jobresult.JobResultsView +import edu.wpi.inndie.ui.view.jobtestview.JobTestView import javafx.scene.control.TabPane import tornadofx.Fragment import tornadofx.tab diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/Main.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/Main.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/Main.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/Main.kt index 604b5192..8d0bccce 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/Main.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/Main.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.view +package edu.wpi.inndie.ui.view -import edu.wpi.axon.ui.view.joblist.JobList -import edu.wpi.axon.ui.view.preferences.PreferencesView +import edu.wpi.inndie.ui.view.joblist.JobList +import edu.wpi.inndie.ui.view.preferences.PreferencesView import javafx.scene.layout.BorderPane import tornadofx.View import tornadofx.action diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/TornadoUtil.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/TornadoUtil.kt similarity index 98% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/TornadoUtil.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/TornadoUtil.kt index 7ba51752..2d88dcdc 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/TornadoUtil.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/TornadoUtil.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view +package edu.wpi.inndie.ui.view import javafx.beans.value.ObservableValue import javafx.event.EventTarget diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/DatasetPicker.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/DatasetPicker.kt similarity index 90% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/DatasetPicker.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/DatasetPicker.kt index eec0d7f0..b50ed562 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/DatasetPicker.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/DatasetPicker.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.ui.model.DatasetModel -import edu.wpi.axon.ui.model.DatasetType -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.view.contentMap -import edu.wpi.axon.util.FilePath +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.ui.model.DatasetModel +import edu.wpi.inndie.ui.model.DatasetType +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.view.contentMap +import edu.wpi.inndie.util.FilePath import javafx.stage.FileChooser import javafx.util.StringConverter import tornadofx.ItemFragment diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobConfiguration.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobConfiguration.kt similarity index 94% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobConfiguration.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobConfiguration.kt index 6057aef1..635f5205 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobConfiguration.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobConfiguration.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor -import edu.wpi.axon.plugin.PluginManager -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.view.isIntGreaterThanOrEqualTo -import edu.wpi.axon.util.datasetPluginManagerName +import edu.wpi.inndie.plugin.PluginManager +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.view.isIntGreaterThanOrEqualTo +import edu.wpi.inndie.util.datasetPluginManagerName import javafx.stage.Modality import kotlin.reflect.KClass import tornadofx.Fragment diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobEditor.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobEditor.kt similarity index 91% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobEditor.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobEditor.kt index 7ee7141f..d08bce6c 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/JobEditor.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/JobEditor.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor import arrow.core.Option -import edu.wpi.axon.db.data.DesiredJobTrainingMethod -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.ui.JobLifecycleManager -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.util.axonBucketName +import edu.wpi.inndie.db.data.DesiredJobTrainingMethod +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.ui.JobLifecycleManager +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.util.inndieBucketName import javafx.beans.property.SimpleObjectProperty import javafx.scene.control.ButtonBar import javafx.scene.control.Label @@ -26,7 +26,7 @@ class JobEditor : Fragment() { private val job by inject() private val jobLifecycleManager by di() - private val bucketName by di>(axonBucketName) + private val bucketName by di>(inndieBucketName) override val root = borderpane { centerProperty().bind(job.itemProperty.objectBinding { diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/LossFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/LossFragment.kt similarity index 92% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/LossFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/LossFragment.kt index 02284b91..d0c642e5 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/LossFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/LossFragment.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.ui.model.JobModel +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.ui.model.JobModel import tornadofx.Fragment import tornadofx.ItemViewModel import tornadofx.action diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/ModelPicker.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/ModelPicker.kt similarity index 92% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/ModelPicker.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/ModelPicker.kt index 81e0697f..27e7c92e 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/ModelPicker.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/ModelPicker.kt @@ -1,13 +1,13 @@ -package edu.wpi.axon.ui.view.jobeditor - -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.ui.ModelManager -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.model.ModelSourceType -import edu.wpi.axon.ui.view.contentMap -import edu.wpi.axon.ui.view.layereditor.LayerEditorFragment -import edu.wpi.axon.util.FilePath +package edu.wpi.inndie.ui.view.jobeditor + +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.ui.ModelManager +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.model.ModelSourceType +import edu.wpi.inndie.ui.view.contentMap +import edu.wpi.inndie.ui.view.layereditor.LayerEditorFragment +import edu.wpi.inndie.util.FilePath import java.io.File import javafx.stage.FileChooser import javafx.stage.Modality diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/OptimizerFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/OptimizerFragment.kt similarity index 90% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/OptimizerFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/OptimizerFragment.kt index 54e58ab9..76ffcdf6 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/OptimizerFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/OptimizerFragment.kt @@ -1,16 +1,16 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.ui.model.AdamDto -import edu.wpi.axon.ui.model.AdamModel -import edu.wpi.axon.ui.model.FTRLDto -import edu.wpi.axon.ui.model.FTRLModel -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.model.RMSpropDto -import edu.wpi.axon.ui.model.RMSpropModel -import edu.wpi.axon.ui.view.isDoubleGreaterThanOrEqualToZero -import edu.wpi.axon.ui.view.isDoubleLessThanOrEqualToZero -import edu.wpi.axon.ui.view.textfield +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.ui.model.AdamDto +import edu.wpi.inndie.ui.model.AdamModel +import edu.wpi.inndie.ui.model.FTRLDto +import edu.wpi.inndie.ui.model.FTRLModel +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.model.RMSpropDto +import edu.wpi.inndie.ui.model.RMSpropModel +import edu.wpi.inndie.ui.view.isDoubleGreaterThanOrEqualToZero +import edu.wpi.inndie.ui.view.isDoubleLessThanOrEqualToZero +import edu.wpi.inndie.ui.view.textfield import javafx.beans.property.Property import tornadofx.Fieldset import tornadofx.Fragment diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/TargetFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/TargetFragment.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/TargetFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/TargetFragment.kt index d16b7742..76581380 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobeditor/TargetFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobeditor/TargetFragment.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.ui.view.jobeditor +package edu.wpi.inndie.ui.view.jobeditor -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.ui.model.CoralDto -import edu.wpi.axon.ui.model.CoralModel -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.view.isDoubleInRange +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.ui.model.CoralDto +import edu.wpi.inndie.ui.model.CoralModel +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.view.isDoubleInRange import javafx.beans.property.Property import javafx.util.StringConverter import tornadofx.Fieldset diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobList.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobList.kt similarity index 88% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobList.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobList.kt index 07a5abc1..58996f30 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobList.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobList.kt @@ -1,21 +1,21 @@ -package edu.wpi.axon.ui.view.joblist +package edu.wpi.inndie.ui.view.joblist import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.db.data.InternalJobTrainingMethod -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.plugin.DatasetPlugins.processMnistTypePlugin -import edu.wpi.axon.tfdata.Dataset -import edu.wpi.axon.tfdata.loss.Loss -import edu.wpi.axon.tfdata.optimizer.Optimizer -import edu.wpi.axon.training.ModelDeploymentTarget -import edu.wpi.axon.ui.ModelManager -import edu.wpi.axon.ui.controller.JobBoard -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.util.getOutputModelName +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.db.data.InternalJobTrainingMethod +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.plugin.DatasetPlugins.processMnistTypePlugin +import edu.wpi.inndie.tfdata.Dataset +import edu.wpi.inndie.tfdata.loss.Loss +import edu.wpi.inndie.tfdata.optimizer.Optimizer +import edu.wpi.inndie.training.ModelDeploymentTarget +import edu.wpi.inndie.ui.ModelManager +import edu.wpi.inndie.ui.controller.JobBoard +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.util.getOutputModelName import javafx.collections.ListChangeListener import javafx.scene.layout.Priority import tornadofx.Scope @@ -162,7 +162,9 @@ class JobList : View() { userMetrics = setOf("accuracy"), userEpochs = 1, userNewModel = modelManager.loadModel(modelSource), - userNewModelFilename = getOutputModelName(modelSource.filename), + userNewModelFilename = getOutputModelName( + modelSource.filename + ), generateDebugComments = false, internalTrainingMethod = InternalJobTrainingMethod.Untrained, target = ModelDeploymentTarget.Desktop, diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobListFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobListFragment.kt similarity index 94% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobListFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobListFragment.kt index 8cc3fe02..fa1eed88 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobListFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobListFragment.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.ui.view.joblist +package edu.wpi.inndie.ui.view.joblist -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.ui.model.JobDto -import edu.wpi.axon.ui.model.JobModel +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.ui.model.JobDto +import edu.wpi.inndie.ui.model.JobModel import javafx.geometry.Orientation import tornadofx.ListCellFragment import tornadofx.action diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobWizard.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobWizard.kt similarity index 95% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobWizard.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobWizard.kt index 8047d7c6..1df65ce7 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/joblist/JobWizard.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/joblist/JobWizard.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.ui.view.joblist - -import edu.wpi.axon.db.JobDb -import edu.wpi.axon.examplemodel.ExampleModelManager -import edu.wpi.axon.ui.controller.WizardTaskService -import edu.wpi.axon.ui.model.JobDto -import edu.wpi.axon.ui.model.JobWizardModel -import edu.wpi.axon.ui.model.TaskInput -import edu.wpi.axon.ui.view.isIntGreaterThanOrEqualTo +package edu.wpi.inndie.ui.view.joblist + +import edu.wpi.inndie.db.JobDb +import edu.wpi.inndie.examplemodel.ExampleModelManager +import edu.wpi.inndie.ui.controller.WizardTaskService +import edu.wpi.inndie.ui.model.JobDto +import edu.wpi.inndie.ui.model.JobWizardModel +import edu.wpi.inndie.ui.model.TaskInput +import edu.wpi.inndie.ui.view.isIntGreaterThanOrEqualTo import javafx.geometry.Pos import javafx.scene.input.MouseButton import javafx.scene.input.MouseEvent diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/JobResultsView.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/JobResultsView.kt similarity index 96% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/JobResultsView.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/JobResultsView.kt index 065708e3..24ecc254 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/JobResultsView.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/JobResultsView.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.ui.view.jobresult +package edu.wpi.inndie.ui.view.jobresult -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.ui.JobLifecycleManager -import edu.wpi.axon.ui.model.JobModel +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.ui.JobLifecycleManager +import edu.wpi.inndie.ui.model.JobModel import javafx.event.EventTarget import javafx.scene.chart.NumberAxis import javafx.scene.control.Label diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/LazyResult.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/LazyResult.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/LazyResult.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/LazyResult.kt index c0e98541..b94c146f 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/LazyResult.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/LazyResult.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view.jobresult +package edu.wpi.inndie.ui.view.jobresult import java.io.File diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/ResultFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/ResultFragment.kt similarity index 98% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/ResultFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/ResultFragment.kt index e1950dc9..013c72d3 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobresult/ResultFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobresult/ResultFragment.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view.jobresult +package edu.wpi.inndie.ui.view.jobresult import java.awt.Desktop import javafx.beans.property.SimpleObjectProperty diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestView.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestView.kt similarity index 92% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestView.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestView.kt index fb49001a..bd22baba 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestView.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestView.kt @@ -1,23 +1,23 @@ -package edu.wpi.axon.ui.view.jobtestview +package edu.wpi.inndie.ui.view.jobtestview import arrow.core.Either -import edu.wpi.axon.db.data.InternalJobTrainingMethod -import edu.wpi.axon.db.data.ModelSource -import edu.wpi.axon.db.data.TrainingScriptProgress -import edu.wpi.axon.plugin.PluginManager -import edu.wpi.axon.testrunner.LocalTestRunner -import edu.wpi.axon.testrunner.TestData -import edu.wpi.axon.ui.ModelManager -import edu.wpi.axon.ui.model.JobDto -import edu.wpi.axon.ui.model.JobModel -import edu.wpi.axon.ui.view.contentMap -import edu.wpi.axon.ui.view.jobresult.LazyResult -import edu.wpi.axon.ui.view.jobresult.ResultFragment -import edu.wpi.axon.util.FilePath -import edu.wpi.axon.util.getLocalTestRunnerWorkingDir -import edu.wpi.axon.util.getLocalTrainingScriptRunnerWorkingDir -import edu.wpi.axon.util.loadTestDataPluginManagerName -import edu.wpi.axon.util.processTestOutputPluginManagerName +import edu.wpi.inndie.db.data.InternalJobTrainingMethod +import edu.wpi.inndie.db.data.ModelSource +import edu.wpi.inndie.db.data.TrainingScriptProgress +import edu.wpi.inndie.plugin.PluginManager +import edu.wpi.inndie.testrunner.LocalTestRunner +import edu.wpi.inndie.testrunner.TestData +import edu.wpi.inndie.ui.ModelManager +import edu.wpi.inndie.ui.model.JobDto +import edu.wpi.inndie.ui.model.JobModel +import edu.wpi.inndie.ui.view.contentMap +import edu.wpi.inndie.ui.view.jobresult.LazyResult +import edu.wpi.inndie.ui.view.jobresult.ResultFragment +import edu.wpi.inndie.util.FilePath +import edu.wpi.inndie.util.getLocalTestRunnerWorkingDir +import edu.wpi.inndie.util.getLocalTrainingScriptRunnerWorkingDir +import edu.wpi.inndie.util.loadTestDataPluginManagerName +import edu.wpi.inndie.util.processTestOutputPluginManagerName import java.io.File import java.nio.file.Path import java.nio.file.Paths diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestViewModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestViewModel.kt similarity index 76% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestViewModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestViewModel.kt index a4efe23e..e0c65127 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/JobTestViewModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/JobTestViewModel.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.view.jobtestview +package edu.wpi.inndie.ui.view.jobtestview -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.testrunner.TestData +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.testrunner.TestData import javafx.beans.property.SimpleObjectProperty import tornadofx.ViewModel diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestDataType.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestDataType.kt similarity index 59% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestDataType.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestDataType.kt index a1951a4d..3244e425 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestDataType.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestDataType.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.ui.view.jobtestview +package edu.wpi.inndie.ui.view.jobtestview enum class TestDataType { FROM_TRAINING_DATA, FROM_FILE diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestResultFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestResultFragment.kt similarity index 84% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestResultFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestResultFragment.kt index 8b71fb7d..b697c326 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/jobtestview/TestResultFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/jobtestview/TestResultFragment.kt @@ -1,7 +1,7 @@ -package edu.wpi.axon.ui.view.jobtestview +package edu.wpi.inndie.ui.view.jobtestview -import edu.wpi.axon.ui.view.jobresult.LazyResult -import edu.wpi.axon.ui.view.jobresult.ResultFragment +import edu.wpi.inndie.ui.view.jobresult.LazyResult +import edu.wpi.inndie.ui.view.jobresult.ResultFragment import java.io.File import javafx.collections.FXCollections import javafx.scene.control.SelectionMode diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerCell.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerCell.kt similarity index 97% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerCell.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerCell.kt index 6721c9a6..4b2bb86a 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerCell.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerCell.kt @@ -1,8 +1,8 @@ -package edu.wpi.axon.ui.view.layereditor +package edu.wpi.inndie.ui.view.layereditor import com.fxgraph.cells.AbstractCell import com.fxgraph.graph.Graph -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer import javafx.geometry.Pos import javafx.scene.Node import javafx.scene.layout.BorderPane diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditor.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditor.kt similarity index 97% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditor.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditor.kt index 2185a15c..85c919f9 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditor.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditor.kt @@ -1,12 +1,12 @@ -package edu.wpi.axon.ui.view.layereditor +package edu.wpi.inndie.ui.view.layereditor import arrow.core.getOrHandle import com.fxgraph.edges.Edge import com.fxgraph.graph.Graph import com.fxgraph.layout.AbegoTreeLayout -import edu.wpi.axon.tfdata.Model -import edu.wpi.axon.tfdata.layer.Layer -import edu.wpi.axon.tflayerloader.DefaultLayersToGraph +import edu.wpi.inndie.tfdata.Model +import edu.wpi.inndie.tfdata.layer.Layer +import edu.wpi.inndie.tflayerloader.DefaultLayersToGraph import javafx.scene.layout.BorderPane import org.abego.treelayout.Configuration import tornadofx.action diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditorFragment.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditorFragment.kt similarity index 90% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditorFragment.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditorFragment.kt index 661bacd5..2086ba14 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/LayerEditorFragment.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/LayerEditorFragment.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.view.layereditor +package edu.wpi.inndie.ui.view.layereditor -import edu.wpi.axon.ui.model.JobModel +import edu.wpi.inndie.ui.model.JobModel import tornadofx.Fragment import tornadofx.action import tornadofx.borderpane diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/TrainableLayerModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/TrainableLayerModel.kt similarity index 86% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/TrainableLayerModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/TrainableLayerModel.kt index 6b1b957e..fe633008 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/TrainableLayerModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/TrainableLayerModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.view.layereditor +package edu.wpi.inndie.ui.view.layereditor -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer import javafx.beans.property.SimpleBooleanProperty import tornadofx.ItemViewModel import tornadofx.getValue diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/UntrainableLayerModel.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/UntrainableLayerModel.kt similarity index 65% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/UntrainableLayerModel.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/UntrainableLayerModel.kt index 1accbe8c..be8e040a 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/layereditor/UntrainableLayerModel.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/layereditor/UntrainableLayerModel.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.view.layereditor +package edu.wpi.inndie.ui.view.layereditor -import edu.wpi.axon.tfdata.layer.Layer +import edu.wpi.inndie.tfdata.layer.Layer import tornadofx.ItemViewModel class UntrainableLayerModel(layer: Layer.MetaLayer.UntrainableLayer) : diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginEditor.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginEditor.kt similarity index 94% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginEditor.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginEditor.kt index 3ad81b26..cf8b127d 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginEditor.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginEditor.kt @@ -1,6 +1,6 @@ -package edu.wpi.axon.ui.view.preferences +package edu.wpi.inndie.ui.view.preferences -import edu.wpi.axon.ui.model.PluginModel +import edu.wpi.inndie.ui.model.PluginModel import javafx.geometry.Orientation import javafx.scene.control.ButtonBar import javafx.scene.layout.Priority diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginManagerEditor.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginManagerEditor.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginManagerEditor.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginManagerEditor.kt index 896813b0..73766eff 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PluginManagerEditor.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PluginManagerEditor.kt @@ -1,10 +1,10 @@ -package edu.wpi.axon.ui.view.preferences +package edu.wpi.inndie.ui.view.preferences import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView -import edu.wpi.axon.plugin.Plugin -import edu.wpi.axon.ui.controller.PluginStore -import edu.wpi.axon.ui.model.PluginModel +import edu.wpi.inndie.plugin.Plugin +import edu.wpi.inndie.ui.controller.PluginStore +import edu.wpi.inndie.ui.model.PluginModel import javafx.scene.layout.Priority import tornadofx.Fragment import tornadofx.bindSelected diff --git a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PreferencesView.kt b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PreferencesView.kt similarity index 89% rename from ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PreferencesView.kt rename to ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PreferencesView.kt index 2c26baec..7bffe4e1 100644 --- a/ui-javafx/src/main/kotlin/edu/wpi/axon/ui/view/preferences/PreferencesView.kt +++ b/ui-javafx/src/main/kotlin/edu/wpi/inndie/ui/view/preferences/PreferencesView.kt @@ -1,11 +1,11 @@ -package edu.wpi.axon.ui.view.preferences +package edu.wpi.inndie.ui.view.preferences -import edu.wpi.axon.ui.controller.DatasetPluginStore -import edu.wpi.axon.ui.controller.LoadTestDataPluginStore -import edu.wpi.axon.ui.controller.PluginStore -import edu.wpi.axon.ui.controller.ProcessTestOutputPluginStore -import edu.wpi.axon.ui.model.PreferencesModel -import edu.wpi.axon.ui.view.isLongInRange +import edu.wpi.inndie.ui.controller.DatasetPluginStore +import edu.wpi.inndie.ui.controller.LoadTestDataPluginStore +import edu.wpi.inndie.ui.controller.PluginStore +import edu.wpi.inndie.ui.controller.ProcessTestOutputPluginStore +import edu.wpi.inndie.ui.model.PreferencesModel +import edu.wpi.inndie.ui.view.isLongInRange import javafx.geometry.Orientation import javafx.scene.control.ButtonBar import software.amazon.awssdk.services.ec2.model.InstanceType diff --git a/ui-javafx/ui-javafx.gradle.kts b/ui-javafx/ui-javafx.gradle.kts index 3c0033eb..7b5ce5a1 100644 --- a/ui-javafx/ui-javafx.gradle.kts +++ b/ui-javafx/ui-javafx.gradle.kts @@ -60,8 +60,8 @@ javafx { } application { - mainClassName = "edu.wpi.axon.ui.main.Axon" -// mainClassName = "edu.wpi.axon.ui.MainUI" + mainClassName = "edu.wpi.inndie.ui.main.INNDiE" +// mainClassName = "edu.wpi.inndie.ui.MainUI" // https://github.com/edvin/tornadofx/issues/899#issuecomment-569709223 applicationDefaultJvmArgs += "--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED" applicationDefaultJvmArgs += "--add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED" diff --git a/util/src/main/kotlin/edu/wpi/axon/util/KoinNames.kt b/util/src/main/kotlin/edu/wpi/axon/util/KoinNames.kt deleted file mode 100644 index 5efdb3d9..00000000 --- a/util/src/main/kotlin/edu/wpi/axon/util/KoinNames.kt +++ /dev/null @@ -1,6 +0,0 @@ -package edu.wpi.axon.util - -const val axonBucketName = "axon-bucket" -const val datasetPluginManagerName = "axon-dataset-plugin-manager" -const val loadTestDataPluginManagerName = "axon-load-test-data-plugin-manager" -const val processTestOutputPluginManagerName = "axon-process-test-output-plugin-manager" diff --git a/util/src/main/kotlin/edu/wpi/axon/util/FilePath.kt b/util/src/main/kotlin/edu/wpi/inndie/util/FilePath.kt similarity index 88% rename from util/src/main/kotlin/edu/wpi/axon/util/FilePath.kt rename to util/src/main/kotlin/edu/wpi/inndie/util/FilePath.kt index dddb8a71..289645d1 100644 --- a/util/src/main/kotlin/edu/wpi/axon/util/FilePath.kt +++ b/util/src/main/kotlin/edu/wpi/inndie/util/FilePath.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.util +package edu.wpi.inndie.util import java.nio.file.Paths import kotlinx.serialization.Serializable @@ -23,7 +23,7 @@ sealed class FilePath { get() = Paths.get(path).fileName.toString() /** - * A path in S3. This does not include any prefixes that Axon uses to sort files. + * A path in S3. This does not include any prefixes that INNDiE uses to sort files. */ @Serializable data class S3(override val path: String) : FilePath() diff --git a/util/src/main/kotlin/edu/wpi/axon/util/GraphUtil.kt b/util/src/main/kotlin/edu/wpi/inndie/util/GraphUtil.kt similarity index 97% rename from util/src/main/kotlin/edu/wpi/axon/util/GraphUtil.kt rename to util/src/main/kotlin/edu/wpi/inndie/util/GraphUtil.kt index 0b98d9a4..fb53fe30 100644 --- a/util/src/main/kotlin/edu/wpi/axon/util/GraphUtil.kt +++ b/util/src/main/kotlin/edu/wpi/inndie/util/GraphUtil.kt @@ -1,13 +1,13 @@ @file:Suppress("UnstableApiUsage") -package edu.wpi.axon.util +package edu.wpi.inndie.util import arrow.Kind2 import arrow.core.ForEither import arrow.core.Left import arrow.core.Right import com.google.common.graph.Graph -import joinWithIndent +import edu.wpi.inndie.logging.joinWithIndent /** * Checks if there are islands in this graph. diff --git a/util/src/main/kotlin/edu/wpi/axon/util/InitializedPropertyModificationException.kt b/util/src/main/kotlin/edu/wpi/inndie/util/InitializedPropertyModificationException.kt similarity index 92% rename from util/src/main/kotlin/edu/wpi/axon/util/InitializedPropertyModificationException.kt rename to util/src/main/kotlin/edu/wpi/inndie/util/InitializedPropertyModificationException.kt index c71f4079..066dd71d 100644 --- a/util/src/main/kotlin/edu/wpi/axon/util/InitializedPropertyModificationException.kt +++ b/util/src/main/kotlin/edu/wpi/inndie/util/InitializedPropertyModificationException.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.util +package edu.wpi.inndie.util /** * Thrown when a property that is already initialized is modified. diff --git a/util/src/main/kotlin/edu/wpi/inndie/util/KoinNames.kt b/util/src/main/kotlin/edu/wpi/inndie/util/KoinNames.kt new file mode 100644 index 00000000..005ae969 --- /dev/null +++ b/util/src/main/kotlin/edu/wpi/inndie/util/KoinNames.kt @@ -0,0 +1,6 @@ +package edu.wpi.inndie.util + +const val inndieBucketName = "inndie-bucket" +const val datasetPluginManagerName = "inndie-dataset-plugin-manager" +const val loadTestDataPluginManagerName = "inndie-load-test-data-plugin-manager" +const val processTestOutputPluginManagerName = "inndie-process-test-output-plugin-manager" diff --git a/util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt b/util/src/main/kotlin/edu/wpi/inndie/util/SingleAssign.kt similarity index 88% rename from util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt rename to util/src/main/kotlin/edu/wpi/inndie/util/SingleAssign.kt index e65fc549..9100cb22 100644 --- a/util/src/main/kotlin/edu/wpi/axon/util/SingleAssign.kt +++ b/util/src/main/kotlin/edu/wpi/inndie/util/SingleAssign.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.util +package edu.wpi.inndie.util import kotlin.reflect.KProperty @@ -26,7 +26,8 @@ interface SingleAssign { private class SynchronizedSingleAssign : UnsynchronizedSingleAssign() { @Volatile - override var value: Any? = UninitializedValue + override var value: Any? = + UninitializedValue override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) { @@ -34,11 +35,13 @@ private class SynchronizedSingleAssign : UnsynchronizedSingleAssign() { } } -private open class UnsynchronizedSingleAssign : SingleAssign { +private open class UnsynchronizedSingleAssign : + SingleAssign { protected object UninitializedValue - protected open var value: Any? = UninitializedValue + protected open var value: Any? = + UninitializedValue override operator fun getValue(thisRef: Any?, property: KProperty<*>): T { if (!isInitialized()) diff --git a/util/src/main/kotlin/edu/wpi/axon/util/Util.kt b/util/src/main/kotlin/edu/wpi/inndie/util/Util.kt similarity index 96% rename from util/src/main/kotlin/edu/wpi/axon/util/Util.kt rename to util/src/main/kotlin/edu/wpi/inndie/util/Util.kt index 41592680..87fa857f 100644 --- a/util/src/main/kotlin/edu/wpi/axon/util/Util.kt +++ b/util/src/main/kotlin/edu/wpi/inndie/util/Util.kt @@ -1,4 +1,4 @@ -package edu.wpi.axon.util +package edu.wpi.inndie.util import arrow.core.Tuple3 import arrow.fx.IO @@ -12,7 +12,7 @@ import mu.KotlinLogging val localCacheDir: Path = Paths.get( System.getProperty("user.home"), ".wpilib", - "Axon" + "INNDiE" ) val localScriptRunnerCache: Path = localCacheDir.resolve("local-script-runner-cache") @@ -72,7 +72,7 @@ fun runCommand( /** * @param parentDir The directory the progress file is in. - * @return The path to the progress reporting file used when Axon is running locally. + * @return The path to the progress reporting file used when INNDiE is running locally. */ fun createLocalProgressFilepath(parentDir: Path): Path = parentDir.resolve(trainingLogCsvFilename)