diff --git a/conda/meta.yaml b/conda/meta.yaml index 87eacc443e98438c71d6ce9d2ed316569d7a71a0..b173d2c3e54a2f769e8d541051cdab8005325581 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -33,21 +33,14 @@ requirements: - scipy - {{ pin_compatible('click') }} - {{ pin_compatible('click-plugins') }} - - tensorflow >=1.4 + - tensorflow >=2.2 test: imports: - {{ name }} commands: - bob tf --help - - bob tf compute-statistics --help - - bob tf db-to-tfrecords --help - - bob tf eval --help - - bob tf predict-bio --help - - bob tf style-transfer --help - - bob tf train --help - - bob tf train-and-evaluate --help - - bob tf trim --help + - bob tf datasets-to-tfrecords --help - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx diff --git a/setup.py b/setup.py index a2ce901099acc2d2c5f608b0f317b5bf22a6d17f..8e00780b0c80252e84e0785b7142d72c6bb7b04e 100644 --- a/setup.py +++ b/setup.py @@ -43,29 +43,16 @@ setup( entry_points={ # main entry for bob tf cli "bob.cli": [ - "tf = bob.learn.tensorflow.script.tf:tf", - "keras = bob.learn.tensorflow.script.keras:keras", + "tf = bob.learn.tensorflow.scripts.tf:tf", + "keras = bob.learn.tensorflow.scripts.keras:keras", ], # bob tf scripts "bob.learn.tensorflow.cli": [ - "cache-dataset = bob.learn.tensorflow.script.cache_dataset:cache_dataset", - "compute-statistics = bob.learn.tensorflow.script.compute_statistics:compute_statistics", - "dataset-to-hdf5 = bob.learn.tensorflow.script.db_to_tfrecords:dataset_to_hdf5", - "datasets-to-tfrecords = bob.learn.tensorflow.script.db_to_tfrecords:datasets_to_tfrecords", - "db-to-tfrecords = bob.learn.tensorflow.script.db_to_tfrecords:db_to_tfrecords", - "describe-tfrecord = bob.learn.tensorflow.script.db_to_tfrecords:describe_tfrecord", - "distance-matrix = bob.learn.tensorflow.script.cgm:distance_matrix", - "eval = bob.learn.tensorflow.script.eval:eval", - "predict = bob.learn.tensorflow.script.predict_bio:predict", - "predict-bio = bob.learn.tensorflow.script.predict_bio:predict_bio", - "style-transfer = bob.learn.tensorflow.script.style_transfer:style_transfer", - "train = bob.learn.tensorflow.script.train:train", - "train-and-evaluate = bob.learn.tensorflow.script.train_and_evaluate:train_and_evaluate", - "trim = bob.learn.tensorflow.script.trim:trim", + "datasets-to-tfrecords = bob.learn.tensorflow.scripts.datasets_to_tfrecords:datasets_to_tfrecords", ], # bob keras scripts "bob.learn.tensorflow.keras_cli": [ - "fit = bob.learn.tensorflow.script.fit:fit", + "fit = bob.learn.tensorflow.scripts.fit:fit", ], }, # Classifiers are important if you plan to distribute this package through