rename magenta.lib to magenta.music (#223)

magenta/BUILD

@@ -23,7 +23,7 @@ py_library(
     srcs = ["__init__.py"],
     visibility = ["//magenta:__subpackages__"],
     deps = [
-        "//magenta/lib",
+        "//magenta/music",
         "//magenta/pipelines",
         "//magenta/protobuf",
     ],

magenta/__init__.py

@@ -23,15 +23,15 @@
   sort
 """
 
-import magenta.lib.melodies_lib
-import magenta.lib.midi_io
-import magenta.lib.note_sequence_io
-import magenta.lib.sequence_example_lib
-import magenta.lib.sequence_generator
-import magenta.lib.sequence_generator_bundle
-import magenta.lib.sequences_lib
-import magenta.lib.testing_lib
-import magenta.lib.tf_lib
+import magenta.music.melodies_lib
+import magenta.music.midi_io
+import magenta.music.note_sequence_io
+import magenta.music.sequence_example_lib
+import magenta.music.sequence_generator
+import magenta.music.sequence_generator_bundle
+import magenta.music.sequences_lib
+import magenta.music.testing_lib
+import magenta.music.tf_lib
 import magenta.pipelines.dag_pipeline
 import magenta.pipelines.pipeline
 import magenta.pipelines.pipelines_common

magenta/interfaces/midi/README.md

@@ -5,7 +5,7 @@ This interface allows you to connect to a model
 and synthesizer. These can be either "hard" or "soft" components.
 
 Note that you can only interface with a trained models that have a
-[SequenceGenerator](/magenta/lib/sequence_generator.py)
+[SequenceGenerator](/magenta/music/sequence_generator.py)
  defined for them.
 
 <p align="center">

magenta/interfaces/midi/magenta_midi.py

@@ -27,10 +27,10 @@
 import mido
 import tensorflow as tf
 
-from magenta.lib import sequence_generator_bundle
 from magenta.models.attention_rnn import attention_rnn_generator
 from magenta.models.basic_rnn import basic_rnn_generator
 from magenta.models.lookback_rnn import lookback_rnn_generator
+from magenta.music import sequence_generator_bundle
 from magenta.protobuf import generator_pb2
 from magenta.protobuf import music_pb2
 

magenta/models/README.md

@@ -6,7 +6,7 @@ This directory contains the various Magenta models.
 All generators for NoteSequence-based models should expose their generator
 functionality by implementing the BaseSequenceGenerator abstract class defined
 in
-[lib/sequence_generator.py](https://github.com/tensorflow/magenta/blob/master/magenta/lib/sequence_generator.py).
+[lib/sequence_generator.py](https://github.com/tensorflow/magenta/blob/master/magenta/music/sequence_generator.py).
 This allows all generators to communicate with a standard protocol (defined in
 [protobuf/genator.proto](https://github.com/tensorflow/magenta/blob/master/magenta/protobuf/generator.proto))
 and will make it easier for various interfaces (e.g., MIDI controllers) to

magenta/models/attention_rnn/attention_rnn_encoder_decoder.py

@@ -16,7 +16,7 @@
 import collections
 
 # internal imports
-from magenta.lib import melodies_lib
+from magenta.music import melodies_lib
 
 NUM_SPECIAL_EVENTS = melodies_lib.NUM_SPECIAL_EVENTS
 NOTE_OFF = melodies_lib.NOTE_OFF

magenta/models/attention_rnn/attention_rnn_graph.py

@@ -14,9 +14,8 @@
 """Provides function to build the attention RNN model's graph."""
 
 # internal imports
-
-from magenta.lib import tf_lib
 from magenta.models.shared import melody_rnn_graph
+from magenta.music import tf_lib
 
 
 def default_hparams():

magenta/models/basic_rnn/basic_rnn_encoder_decoder.py

@@ -14,7 +14,7 @@
 """A MelodyEncoderDecoder specific to the basic RNN model."""
 
 # internal imports
-from magenta.lib import melodies_lib
+from magenta.music import melodies_lib
 
 NUM_SPECIAL_EVENTS = melodies_lib.NUM_SPECIAL_EVENTS
 

magenta/models/basic_rnn/basic_rnn_graph.py

@@ -14,9 +14,8 @@
 """Provides function to build the basic RNN model's graph."""
 
 # internal imports
-
-from magenta.lib import tf_lib
 from magenta.models.shared import melody_rnn_graph
+from magenta.music import tf_lib
 
 
 def default_hparams():

magenta/models/lookback_rnn/lookback_rnn_encoder_decoder.py

@@ -14,7 +14,7 @@
 """A MelodyEncoderDecoder specific to the lookback RNN model."""
 
 # internal imports
-from magenta.lib import melodies_lib
+from magenta.music import melodies_lib
 
 NUM_SPECIAL_EVENTS = melodies_lib.NUM_SPECIAL_EVENTS
 NO_EVENT = melodies_lib.NO_EVENT

magenta/models/lookback_rnn/lookback_rnn_graph.py

@@ -14,9 +14,8 @@
 """Provides function to build the lookback RNN model's graph."""
 
 # internal imports
-
-from magenta.lib import tf_lib
 from magenta.models.shared import melody_rnn_graph
+from magenta.music import tf_lib
 
 
 def default_hparams():

magenta/models/shared/melody_rnn_create_dataset.py

@@ -22,7 +22,7 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
+from magenta.music import melodies_lib
 from magenta.pipelines import dag_pipeline
 from magenta.pipelines import pipeline
 from magenta.pipelines import pipelines_common

magenta/models/shared/melody_rnn_create_dataset_test.py

@@ -16,9 +16,9 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
-from magenta.lib import testing_lib
 from magenta.models.shared import melody_rnn_create_dataset
+from magenta.music import melodies_lib
+from magenta.music import testing_lib
 from magenta.pipelines import pipelines_common
 from magenta.protobuf import music_pb2
 

magenta/models/shared/melody_rnn_generate.py

@@ -25,10 +25,10 @@
 from six.moves import range  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
-from magenta.lib import midi_io
-from magenta.lib import sequence_generator
-from magenta.lib import sequence_generator_bundle
+from magenta.music import melodies_lib
+from magenta.music import midi_io
+from magenta.music import sequence_generator
+from magenta.music import sequence_generator_bundle
 from magenta.protobuf import generator_pb2
 
 FLAGS = tf.app.flags.FLAGS

magenta/models/shared/melody_rnn_graph.py

@@ -16,7 +16,7 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import sequence_example_lib
+from magenta.music import sequence_example_lib
 
 
 def build_graph(mode, hparams, encoder_decoder, sequence_example_file=None):

magenta/models/shared/melody_rnn_graph_test.py

@@ -16,9 +16,9 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
-from magenta.lib import tf_lib
 from magenta.models.shared import melody_rnn_graph
+from magenta.music import melodies_lib
+from magenta.music import tf_lib
 
 
 class MelodyRNNGraphTest(tf.test.TestCase):

magenta/models/shared/melody_rnn_sequence_generator.py

@@ -19,9 +19,9 @@
 from six.moves import range  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
-from magenta.lib import sequence_generator
-from magenta.lib import sequences_lib
+from magenta.music import melodies_lib
+from magenta.music import sequence_generator
+from magenta.music import sequences_lib
 from magenta.protobuf import generator_pb2
 
 

magenta/lib/BUILD → magenta/music/BUILD

@@ -23,7 +23,7 @@ licenses(["notice"])  # Apache 2.0
 
 # The Magenta public API.
 py_library(
-    name = "lib",
+    name = "music",
     deps = [
         ":melodies_lib",
         ":midi_io",

magenta/lib/chord_symbols_lib_test.py → magenta/music/chord_symbols_lib_test.py

@@ -16,7 +16,7 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import chord_symbols_lib
+from magenta.music import chord_symbols_lib
 
 CHORD_QUALITY_MAJOR = chord_symbols_lib.CHORD_QUALITY_MAJOR
 CHORD_QUALITY_MINOR = chord_symbols_lib.CHORD_QUALITY_MINOR

magenta/lib/chords_lib.py → magenta/music/chords_lib.py

@@ -24,9 +24,9 @@
 
 from six.moves import range  # pylint: disable=redefined-builtin
 
-from magenta.lib import chord_symbols_lib
-from magenta.lib import events_lib
-from magenta.lib import melodies_lib
+from magenta.music import chord_symbols_lib
+from magenta.music import events_lib
+from magenta.music import melodies_lib
 from magenta.pipelines import statistics
 from magenta.protobuf import music_pb2
 

magenta/lib/chords_lib_test.py → magenta/music/chords_lib_test.py

@@ -16,11 +16,11 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import chord_symbols_lib
-from magenta.lib import chords_lib
-from magenta.lib import melodies_lib
-from magenta.lib import sequences_lib
-from magenta.lib import testing_lib
+from magenta.music import chord_symbols_lib
+from magenta.music import chords_lib
+from magenta.music import melodies_lib
+from magenta.music import sequences_lib
+from magenta.music import testing_lib
 
 NO_CHORD = chords_lib.NO_CHORD
 

magenta/lib/events_lib.py → magenta/music/events_lib.py

@@ -26,7 +26,7 @@
 
 from six.moves import range  # pylint: disable=redefined-builtin
 
-from magenta.lib import sequence_example_lib
+from magenta.music import sequence_example_lib
 
 
 # Constants.

magenta/lib/events_lib_test.py → magenta/music/events_lib_test.py

@@ -18,7 +18,7 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import events_lib
+from magenta.music import events_lib
 
 
 class EventsLibTest(tf.test.TestCase):

magenta/lib/lead_sheets_lib.py → magenta/music/lead_sheets_lib.py

@@ -17,9 +17,9 @@
 import copy
 import itertools
 
-from magenta.lib import chords_lib
-from magenta.lib import events_lib
-from magenta.lib import melodies_lib
+from magenta.music import chords_lib
+from magenta.music import events_lib
+from magenta.music import melodies_lib
 from magenta.pipelines import statistics
 from magenta.protobuf import music_pb2
 

magenta/lib/lead_sheets_lib_test.py → magenta/music/lead_sheets_lib_test.py

@@ -16,11 +16,11 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import chords_lib
-from magenta.lib import lead_sheets_lib
-from magenta.lib import melodies_lib
-from magenta.lib import sequences_lib
-from magenta.lib import testing_lib
+from magenta.music import chords_lib
+from magenta.music import lead_sheets_lib
+from magenta.music import melodies_lib
+from magenta.music import sequences_lib
+from magenta.music import testing_lib
 
 NOTE_OFF = melodies_lib.NOTE_OFF
 NO_EVENT = melodies_lib.NO_EVENT

magenta/lib/melodies_lib.py → magenta/music/melodies_lib.py

@@ -37,7 +37,7 @@
 import numpy as np
 from six.moves import range  # pylint: disable=redefined-builtin
 
-from magenta.lib import events_lib
+from magenta.music import events_lib
 from magenta.pipelines import statistics
 from magenta.protobuf import music_pb2
 

magenta/lib/melodies_lib_test.py → magenta/music/melodies_lib_test.py

@@ -16,10 +16,10 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib import melodies_lib
-from magenta.lib import sequence_example_lib
-from magenta.lib import sequences_lib
-from magenta.lib import testing_lib
+from magenta.music import melodies_lib
+from magenta.music import sequence_example_lib
+from magenta.music import sequences_lib
+from magenta.music import testing_lib
 
 
 NUM_SPECIAL_EVENTS = melodies_lib.NUM_SPECIAL_EVENTS

magenta/lib/midi_io.py → magenta/music/midi_io.py

@@ -120,7 +120,7 @@ def midi_to_sequence_proto(midi_data):
   # sorting them primarily by start and secondarily by end, and finally looping
   # through this sorted list and appending each as a new sequence.note. We also
   # here set the sequence.total_time as the max end time in the notes.
-  # TODO(@douglaseck): Eliminate some of this boilerplate code.
+  # TODO(douglaseck): Eliminate some of this boilerplate code.
   midi_notes = []
   midi_pitch_bends = []
   midi_control_changes = []
@@ -166,7 +166,7 @@ def midi_to_sequence_proto(midi_data):
     control_change.control_value = midi_control_change.value
     control_change.is_drum = is_drum
 
-  # TODO(@douglaseck): Estimate note type (e.g. quarter note) and populate
+  # TODO(douglaseck): Estimate note type (e.g. quarter note) and populate
   # note.numerator and note.denominator.
 
   return sequence
@@ -211,7 +211,7 @@ def sequence_proto_to_pretty_midi(sequence):
     pm.key_signature_changes.append(key_signature)
 
   # Populate tempo. The first tempo change was done in PrettyMIDI constructor.
-  # TODO(@douglaseck): Update this code if pretty_midi adds the ability to
+  # TODO(douglaseck): Update this code if pretty_midi adds the ability to
   # write tempo.
   if len(sequence.tempos) > 1:
     for seq_tempo in sequence.tempos[1:]:

magenta/lib/midi_io_test.py → magenta/music/midi_io_test.py

@@ -22,7 +22,7 @@
 import pretty_midi
 import tensorflow as tf
 
-from magenta.lib import midi_io
+from magenta.music import midi_io
 
 # self.midi_simple_filename contains a c-major scale of 8 quarter notes each
 # with a sustain of .95 of the entire note. Here are the first two notes dumped

magenta/lib/music21_to_note_sequence_io.py → magenta/music/music21_to_note_sequence_io.py

@@ -20,7 +20,7 @@
 import os
 
 # internal imports
-from magenta.lib import pretty_music21
+from magenta.music import pretty_music21
 from magenta.protobuf import music_pb2
 
 

magenta/lib/music21_to_note_sequence_io_test.py → magenta/music/music21_to_note_sequence_io_test.py

@@ -19,11 +19,11 @@
 import music21
 import tensorflow as tf
 
-from magenta.lib import pretty_music21
-from magenta.lib.music21_to_note_sequence_io import _MUSIC21_TO_NOTE_SEQUENCE_MODE
-from magenta.lib.music21_to_note_sequence_io import _PRETTY_MUSIC21_TO_NOTE_SEQUENCE_KEY_NAME
-from magenta.lib.music21_to_note_sequence_io import music21_to_sequence_proto
-from magenta.lib.music21_to_note_sequence_io import pretty_music21_to_sequence_proto
+from magenta.music import pretty_music21
+from magenta.music.music21_to_note_sequence_io import _MUSIC21_TO_NOTE_SEQUENCE_MODE
+from magenta.music.music21_to_note_sequence_io import _PRETTY_MUSIC21_TO_NOTE_SEQUENCE_KEY_NAME
+from magenta.music.music21_to_note_sequence_io import music21_to_sequence_proto
+from magenta.music.music21_to_note_sequence_io import pretty_music21_to_sequence_proto
 from magenta.protobuf import music_pb2
 
 

magenta/lib/music_xml_io.py → magenta/music/music_xml_io.py

@@ -9,7 +9,7 @@
 # internal imports
 import music21
 
-from magenta.lib.music21_to_note_sequence_io import music21_to_sequence_proto
+from magenta.music.music21_to_note_sequence_io import music21_to_sequence_proto
 
 
 def music_xml_to_sequence_proto(musicxml_fpath):

magenta/lib/music_xml_io_test.py → magenta/music/music_xml_io_test.py

@@ -5,7 +5,7 @@
 # internal imports
 import tensorflow as tf
 
-from magenta.lib.music_xml_io import music_xml_to_sequence_proto
+from magenta.music.music_xml_io import music_xml_to_sequence_proto
 
 
 class MusicXmlIOTest(tf.test.TestCase):