lavavu 1.9.9__tar.gz → 1.9.10__tar.gz

{lavavu-1.9.9 → lavavu-1.9.10}/Makefile

@@ -256,8 +256,9 @@ endif
 
 .PHONY: swig
 swig : $(INC) src/LavaVuPython.i | paths
+	#NOTE: bug in swig requires pip install swig==4.2 until fixed
 	swig -v -Wextra -python -py3 -ignoremissing -O -c++ -DSWIG_DO_NOT_WRAP -outdir $(PREFIX) src/LavaVuPython.i
-	cd $(PREFIX)/osmesa; ln -sf ../LavaVuPython.py; touch __init__.py
+	cd $(PREFIX)/osmesa; touch __init__.py
 
 $(SWIGLIB) : $(LIBRARY) $(SWIGOBJ)
 	-rm -f $(PREFIX)/_LavaVuPython.*

{lavavu-1.9.9/lavavu.egg-info → lavavu-1.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.9
+Version: 1.9.10
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -217,6 +217,7 @@ Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
 Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
+Requires-Dist: pillow
 Dynamic: license-file
 
 ![# logo](http://owen.kaluza.id.au/Slides/2017-08-15/LavaVu.png)
@@ -224,7 +225,7 @@ Dynamic: license-file
 [![Build Status](https://github.com/lavavu/LavaVu/workflows/Test/badge.svg)](https://github.com/lavavu/LavaVu/actions?query=workflow:Test)
 [![Deploy Status](https://github.com/lavavu/LavaVu/workflows/Deploy/badge.svg?branch=1.7.3)](https://github.com/lavavu/LavaVu/actions?query=workflow:Deploy)
 [![DOI](https://zenodo.org/badge/45163055.svg)](https://zenodo.org/badge/latestdoi/45163055)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.9)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.10)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.9.9 → lavavu-1.9.10}/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://github.com/lavavu/LavaVu/workflows/Test/badge.svg)](https://github.com/lavavu/LavaVu/actions?query=workflow:Test)
 [![Deploy Status](https://github.com/lavavu/LavaVu/workflows/Deploy/badge.svg?branch=1.7.3)](https://github.com/lavavu/LavaVu/actions?query=workflow:Deploy)
 [![DOI](https://zenodo.org/badge/45163055.svg)](https://zenodo.org/badge/latestdoi/45163055)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.9)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.10)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu/LavaVuPython.py

@@ -5,12 +5,14 @@
 # the SWIG interface file instead.
 
 from sys import version_info as _swig_python_version_info
-# Import the low-level C/C++ module
-if __package__ or "." in __name__:
-    from . import _LavaVuPython
+
+import os
+if 'osmesa' in os.environ.get('LV_CONTEXT', ''):
+    from osmesa import _LavaVuPython
 else:
     import _LavaVuPython
 
+
 try:
     import builtins as __builtin__
 except ImportError:

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu/html/webview.html

@@ -27,7 +27,7 @@
 
     <input id="fileinput" type="file" style="visibility:hidden" onchange="useFileInput(this)" />
 
-    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.9.9/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.9.10/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu/lavavu.py

@@ -59,6 +59,7 @@ import quaternion as quat
 import platform
 import matplotlib
 from pathlib import Path
+from PIL import Image as PILImage
 
 if sys.version_info[0] < 3:
     print("Python 3 required. LavaVu no longer supports Python 2.7.")
@@ -101,10 +102,7 @@ if platform.system() == 'Linux':
                 context = 'moderngl'
             except Exception as e:
                 context = 'osmesa'
-
-        if context == 'osmesa':
-            #OSMesa fallback, CPU only, multicore
-            from osmesa import LavaVuPython
+            os.environ['LV_CONTEXT'] = context
 
 #Default module if none already loaded
 try:
@@ -112,8 +110,6 @@ try:
 except:
     import LavaVuPython
 
-os.environ['LV_CONTEXT'] = context
-
 version = LavaVuPython.version
 server_ports = []
 
@@ -4194,7 +4190,7 @@ class Viewer(dict):
         from IPython.display import display,HTML,Javascript
         display(Javascript(js + code))
 
-    def video(self, filename="", resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
+    def video(self, filename="", resolution=(0,0), fps=30, quality=2, encoder=None, embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -4220,7 +4216,7 @@ class Viewer(dict):
             encoding artifacts at cost of larger file size
             If omitted will use default settings, can fine tune settings in kwargs
         encoder : str
-            Name of encoder to use, eg: "h264" (default), "mpeg"
+            Name of encoder to use, eg: "h264" (default for .mp4), default will be selected based on filename extension
         embed : bool
             Set to true to embed the video file rather than link to url
             Not recommended for large videos, default is False
@@ -4240,8 +4236,7 @@ class Viewer(dict):
         """
         return Video(self, filename, resolution, fps, quality, encoder, embed, player, options, **kwargs)
 
-    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
-        my_func.__doc__
+    def video_steps(self, filename="", start=0, end=0, resolution=(0,0), fps=30, quality=2, encoder=None, embed=False, player=None, options={}, **kwargs):
         """
         Record a video of the model by looping through all time steps
 
@@ -5479,7 +5474,7 @@ class Video(object):
     ...         lv.rotate('y', 10) # doctest: +SKIP
     ...         lv.render()        # doctest: +SKIP
     """
-    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder="h264", embed=False, player=None, options={}, **kwargs):
+    def __init__(self, viewer, filename="output.mp4", resolution=(0,0), framerate=30, quality=2, encoder=None, embed=False, player=None, options={}, **kwargs):
         """
         Record and show the generated video inline within an ipython notebook.
 
@@ -5505,7 +5500,7 @@ class Video(object):
         resolution : list or tuple
             Video resolution in pixels [x,y]
         encoder : str
-            Name of encoder to use, eg: "h264" (default), "mpeg"
+            Name of encoder to use, eg: "h264" (default for .mp4), default will be selected based on filename extension
         embed : bool
             Set to true to embed the video file rather than link to url
             Not recommended for large videos, default is False
@@ -5555,6 +5550,22 @@ class Video(object):
                 self.player = {}
         if embed:
             self.player["embed"] = True
+        if encoder is None:
+            if self.filename.suffix.lower() == '.mp4':
+                encoder = 'h264'
+            elif self.filename.suffix.lower() == '.webm':
+                encoder = 'libvpx-vp9'
+            elif self.filename.suffix.lower() == '.webp':
+                encoder = 'libwebp_anim'
+                options["lossless"] = "1"
+                options['pix_fmt'] = "rgb32" #Required for lossless
+                options["loop"] = "0" #This doesn't work, quality also has no effect
+                options["quality"] = str(min(30 + self.quality * 20, 100))
+            elif self.filename.suffix.lower() == '.gif':
+                encoder = 'gif'
+                options['pix_fmt'] = "rgb8"
+            else:
+                encoder = 'h264'
         self.encoder = encoder
         self.options = options
         #Also include extra args
@@ -5565,7 +5576,6 @@ class Video(object):
         """
         Start recording, all rendered frames will be added to the video
         """
-        #https://trac.ffmpeg.org/wiki/Encode/H.264
         # The range of the CRF scale is 0–51, where 0 is lossless (for 8 bit only, for 10 bit use -qp 0), 
         # 23 is the default, and 51 is worst quality possible
         #Compression level, lower = high quality
@@ -5578,7 +5588,8 @@ class Video(object):
             return
 
         if self.encoder == 'h264' or self.encoder == 'libx265':
-            #Only have default options for h264/265 for now
+            #https://trac.ffmpeg.org/wiki/Encode/H.264
+            #options['pix_fmt'] = "yuv420"
             if self.quality == 1:
                 options['qmin'] = '30' #'20' #'8'
                 options['qmax'] = '35' #'41'
@@ -5596,21 +5607,26 @@ class Video(object):
             options["preset"] = 'veryfast' #'veryfast' 'medium' 'slow'
             options["tune"] = 'animation' #'film'
 
-            #Settings from our original c++ encoder
-            #self.options['i_quant_factor'] = '0.71'
-            #self.options['qcompress'] = '0.6'
-            #self.options['max_qdiff'] = '4'
-            #self.options['refs'] = '3'
+        elif self.encoder == 'libvpx-vp9':
+            #https://trac.ffmpeg.org/wiki/Encode/VP9
+            options['crf'] = '15'
+            options['b:v'] = '0' #Required for constant quality single pass
+            if self.quality == 1:
+                options['crf'] = '30' #'40'
+            elif self.quality == 2:
+                options['crf'] = '20' #'23'
+            elif self.quality == 3:
+                options['crf'] = '10' #'10'
+                #options['pix_fmt'] = "yuv444p"
 
         #Merge user options, allowing override of above settings
         options.update(self.options)
+        #print(options, self.encoder)
 
-        #print(options)
         self.container = av.open(str(self.filename), mode="w")
         self.stream = self.container.add_stream(self.encoder, rate=self.framerate, options=options)
         self.stream.width = self.resolution[0]
         self.stream.height = self.resolution[1]
-        self.stream.pix_fmt = "yuv420p"
         self.viewer.recording = self
 
         stream = self.stream
@@ -5620,14 +5636,52 @@ class Video(object):
         #print(stream.profiles)
         #print(stream.profile)
         #print(stream.options)
+
+        if 'pix_fmt' in options:
+            self.stream.pix_fmt = options['pix_fmt']
+        #Select higher quality colour where supported
+        elif self.encoder == 'h264' or self.encoder == 'libx265' or self.encoder == 'libvpx-vp9':
+            #Reduce chroma subsampling for better colour output
+            if self.quality < 3:
+                self.stream.pix_fmt = "yuv420p"
+            else:
+                self.stream.pix_fmt = "yuv422p"
+            #10 bit formats
+            #self.stream.pix_fmt = "yuv444p10le"
+            #self.stream.pix_fmt = "yuv422p10le"
+
         #Need to set profile here or it isn't applied
-        #(Default to main)
-        stream.profile = 'Main' #Baseline / High
+        #(better chroma sampling requires the correct profile)
+        if 'profile' in options:
+            stream.profile = options['profile']
+        elif self.encoder == 'h264' or self.encoder == 'libx265':
+            #['Baseline', 'Constrained Baseline', 'Main', 'Extended',
+            # 'High', 'High 10', 'High 10 Intra', 'High 4:2:2',
+            # 'High 4:2:2 Intra', 'High 4:4:4', 'High 4:4:4 Predictive',
+            # 'High 4:4:4 Intra', 'CAVLC 4:4:4', 'Multiview High', 'Stereo High']
+                    #stream.profile = 'High 4:4:4'
+            if self.stream.pix_fmt == 'yuv420p':
+                stream.profile = 'Main'
+            elif 'yuv422' in self.stream.pix_fmt:
+                stream.profile = 'High 4:2:2'
+            elif 'yuv444' in self.stream.pix_fmt:
+                stream.profile = 'High 4:4:4'
+        elif self.encoder == 'libvpx-vp9':
+            #Profile Color Depth    Chroma Subsampling
+            #0       8 bit/sample   4:2:0
+            #1       8 bit          4:2:2,4:4:4
+            #2       10 or 12 bit   4:2:0
+            #3       10 or 12 bit   4:2:2, 4:4:4
+            if self.stream.pix_fmt == 'yuv420p':
+                stream.profile = 'Profile 0'
+            elif 'yuv422' in self.stream.pix_fmt or 'yuv444' in self.stream.pix_fmt:
+                stream.profile = 'Profile 1'
+
         cc = stream.codec_context
         #print(cc.options)
-        #print(cc.profile)
+        #print(cc.profile, stream.pix_fmt)
 
-    def frame(self):
+    def frame(self, img=None):
         """
         Write a frame, called when viewer.render() is called
         while a recording is in progress
@@ -5639,10 +5693,17 @@ class Video(object):
             else:
                 fn = self.filename / f"{self.framecount:06}_{self.basename}.{self.encoder}"
             self.framecount += 1
-            self.viewer.image(str(fn), resolution=self.resolution)
+            if img:
+                image = PILImage.fromarray(img)
+                image.save(fn)
+                image.save(fn, subsampling=0, quality=95)
+            else:
+                self.viewer.image(str(fn), resolution=self.resolution)
         else:
-            img = self.viewer.rawimage(resolution=self.resolution, channels=3)
-            frame = av.VideoFrame.from_ndarray(img.data, format="rgb24")
+            if img is None:
+                img = self.viewer.rawimage(resolution=self.resolution, channels=3).data
+            frame = av.VideoFrame.from_ndarray(img, format="rgb24")
+            #frame = av.VideoFrame.from_image(PILImage.fromarray(img)) #, format="rgb24")
             for packet in self.stream.encode(frame):
                 self.container.mux(packet)
 
@@ -5697,23 +5758,16 @@ class Video(object):
                 image = image.reshape(self.resolution[0], self.resolution[1], 4)
                 image = image[::,::,:3] #Remove alpha channel
 
-            if self.encoder == 'jpg' or self.encoder == 'png':
-                from PIL import Image as PILImage
-                img = PILImage.fromarray(image)
-                fn = self.filename / f"{self.framecount:06}_{self.basename}.{self.encoder}"
-                self.framecount += 1
-                img.save(fn)
-                return
-
-            frame = av.VideoFrame.from_ndarray(image, format="rgb24")
-            for packet in self.stream.encode(frame):
-                self.container.mux(packet)
+            self.frame(image)
 
     def play(self):
         """
         Show the video in an inline player if in an interactive notebook
         """
-        if self.encoder == 'jpg' or self.encoder == 'png':
+        if self.encoder == 'gif' or self.encoder == 'libwebp_anim':
+            from IPython.display import display,Image
+            display(Image(self.filename, **self.player))
+        elif self.encoder == 'jpg' or self.encoder == 'png':
             from IPython.display import display,HTML
             display(HTML('<p>Video written to images, no player available</p>'))
         else:
@@ -5841,7 +5895,6 @@ class Image(object):
         """
         try:
             #Get array from PIL images
-            from PIL import Image as PILImage
             if isinstance(source, PILImage.Image):
                 source = numpy.array(source)
         except (ImportError) as e:

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu/tracers.py

@@ -24,7 +24,7 @@ def random_particles(count, lowerbound=[0,0,0], upperbound=[1,1,1], dims=3):
     return numpy.stack(p).T
 
 class Tracers():
-    def __init__(self, grid, count=1000, lowerbound=None, upperbound=None, limit=None, age=4, respawn_chance=0.2, speed_multiply=1.0, height=0.0, label='', viewer=None):
+    def __init__(self, grid, count=1000, lowerbound=None, upperbound=None, limit=0, age=4, respawn_chance=0.2, speed_multiply=1.0, height=0.0, label='', viewer=None, seed=0):
         """
         Seed random particles into a vector field and trace their positions
 
@@ -40,10 +40,7 @@ class Tracers():
         upperbound : optional maximum vertex point defining particle bounding box,
             if not provided will be taken from grid upper corner
         limit : float
-            Distance limit over which tracers are not connected,
-            For example if using a periodic boundary, setting limit to
-            half the bounding box size will prevent tracer lines being
-            connected when passing through the boundary
+            Distance limit over which tracers are not drawn
         age : int
             Minimum particle age in steps after which particle can be deleted and respawned, defaults to 4
         respawn : float
@@ -56,6 +53,9 @@ class Tracers():
             Name label prefix for the visualisation objects when plotting
         viewer : lavavu.Viewer
             Viewer object for plotting functions
+        seed : int
+            Random seed for deterministic random particle positions, default=0, set to None to use
+            system time which will produce non-deterministic results (different each run)
         """
         if len(grid) == 2:
             self.gridx = grid[0]
@@ -108,20 +108,18 @@ class Tracers():
         self.arrows = None
         self.tracers = None
 
+        if seed is not None:
+            random.seed(seed)
 
     def respawn(self, r):
         #Dead or out of bounds particle, start at new position
         #Loop until new position further from current position than limit
         old_pos = self.positions[r]
         pos = numpy.array([0.] * self.dims)
-        for i in range(10):
-            pos = random_particles(1, self.lowerbound, self.upperbound, self.dims)
-            dist = numpy.linalg.norm(old_pos - pos)
-            if dist > self.limit*1.01:
-                break
-
+        pos = random_particles(1, self.lowerbound, self.upperbound, self.dims)
         self.ages[r] = 0
         self.positions[r] = pos
+        self.velocities[r] = numpy.array([0.0] * self.dims)
 
     def update(self, vectors=None):
         #Interpolate velocity at all positions,
@@ -140,24 +138,21 @@ class Tracers():
 
         for r in range(len(self.velocities)):
             #Lookup velocity at this index, multiply by position to get delta and add
-            self.speed[r] = numpy.linalg.norm(self.velocities[r])
-            if numpy.isnan(self.speed[r]): self.speed[r] = 0.0
-            if self.speed[r] == 0.0: #numpy.any(numpy.isinf(self.old_pos[r])) or numpy.any(numpy.isinf(self.positions[r])):
+            if self.ages[r] < 0:
                 self.respawn(r)
             else:
+                self.speed[r] = numpy.linalg.norm(self.velocities[r])
+                if numpy.isnan(self.speed[r]) or numpy.isinf(self.speed[r]): self.speed[r] = 0.0
                 self.positions[r] = self.positions[r] + self.speed_multiply * self.velocities[r]
                 self.ages[r] += 1
 
-            #Bounds checks
-            #Chance of killing particle when over age, default 1 in 5 (0.2)
-            if (any(self.positions[r] < self.lowerbound[0:self.dims]) or any(self.positions[r] > self.upperbound[0:self.dims])
-            or (self.ages[r] > self.age and numpy.random.uniform() <= self.respawn_chance)):
-                #if r < 20: print("Kill", r, self.speed[r], numpy.isnan(self.speed[r])) # [0] == numpy.nan)
-                #self.positions[r] = numpy.array([numpy.inf] * self.dims)
-                #self.positions[r] = numpy.array([numpy.nan] * self.dims)
-                self.respawn(r)
-                self.velocities[r] = numpy.array([0.0] * self.dims)
-                self.speed[r] = 0.0
+                #Bounds checks
+                #Chance of killing particle when over age, default 1 in 5 (0.2)
+                if (any(self.positions[r] < self.lowerbound[0:self.dims]) or any(self.positions[r] > self.upperbound[0:self.dims])
+                or (self.ages[r] > self.age and numpy.random.uniform() <= self.respawn_chance)):
+                    self.positions[r] = numpy.array([numpy.nan] * self.dims)
+                    self.ages[r] = -1
+                    self.velocities[r] = numpy.array([0.0] * self.dims)
 
         if self.lv:
             positions = self.get_positions()

{lavavu-1.9.9 → lavavu-1.9.10/lavavu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.9
+Version: 1.9.10
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -217,6 +217,7 @@ Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
 Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
+Requires-Dist: pillow
 Dynamic: license-file
 
 ![# logo](http://owen.kaluza.id.au/Slides/2017-08-15/LavaVu.png)
@@ -224,7 +225,7 @@ Dynamic: license-file
 [![Build Status](https://github.com/lavavu/LavaVu/workflows/Test/badge.svg)](https://github.com/lavavu/LavaVu/actions?query=workflow:Test)
 [![Deploy Status](https://github.com/lavavu/LavaVu/workflows/Deploy/badge.svg?branch=1.7.3)](https://github.com/lavavu/LavaVu/actions?query=workflow:Deploy)
 [![DOI](https://zenodo.org/badge/45163055.svg)](https://zenodo.org/badge/latestdoi/45163055)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.9)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.10)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu.egg-info/SOURCES.txt

@@ -45,7 +45,6 @@ lavavu/html/stats.min.js
 lavavu/html/styles.css
 lavavu/html/webview-template.html
 lavavu/html/webview.html
-lavavu/osmesa/LavaVuPython.py
 lavavu/osmesa/__init__.py
 lavavu/shaders/default.frag
 lavavu/shaders/default.vert

{lavavu-1.9.9 → lavavu-1.9.10}/lavavu.egg-info/requires.txt

@@ -3,3 +3,4 @@ aiohttp
 jupyter_server_proxy
 matplotlib
 numpy-quaternion
+pillow

{lavavu-1.9.9 → lavavu-1.9.10}/requirements.txt

@@ -3,4 +3,5 @@ aiohttp
 jupyter_server_proxy
 matplotlib
 numpy-quaternion
+pillow
 

{lavavu-1.9.9 → lavavu-1.9.10}/setup.py

@@ -19,7 +19,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.9.9"
+version = "1.9.10"
 
 """
 To release a new verison:
@@ -368,7 +368,7 @@ if __name__ == "__main__":
                 defines += [('HAVE_LIBTIFF', 1)]
                 libs += ['tiff']
 
-            if (find_library('avcodec') and find_library('avformat') and find_library('avutil')
+            if ("LV_VIDEO" in os.environ and find_library('avcodec') and find_library('avformat') and find_library('avutil')
                 and check_libraries(['avcodec', 'avformat', 'avutil'],
                     ['libavformat/avformat.h', 'libavcodec/avcodec.h', 'libavutil/mathematics.h',
                      'libavutil/imgutils.h'])):