whispercpp 1.2.0.2 → 1.3.1

data/Rakefile

@@ -1,104 +1,64 @@
-require 'erb'
-require 'open3'
 require 'rake/clean'
-require 'rake/testtask'
-require 'rubygems/package'
-
-CLEAN.include '**/*.o'
-CLEAN.include "**/*.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
-CLOBBER.include 'doc'
-CLOBBER.include '**/*.log'
-CLOBBER.include '**/Makefile'
-CLOBBER.include '**/extconf.h'
-CLOBBER.include '**/extconf.h'
-CLOBBER.include '**/whisper.*'
-CLOBBER.include '**/ggml.*'
-CLOBBER.include '**/dr_wav.h'
-
-BUILD_VERSION=2
-# Determine the current version of the software
-if File.read('../../CMakeLists.txt') =~ /project.*\s*VERSION\s*(\d.+)\)/
-  CURRENT_VERSION = "#{$1}.#{BUILD_VERSION}"
-else
-  CURRENT_VERSION = "0.0.0.#{BUILD_VERSION}"
+require "bundler/gem_tasks"
+require "rake/testtask"
+require_relative "extsources"
+
+SOURCES = FileList[]
+
+EXTSOURCES.each do |src|
+  basename = src.pathmap("%f")
+  dest = basename == "LICENSE" ? basename : src.pathmap("%{../..,ext}p")
+  dir = dest.pathmap("%d")
+  file src
+  directory dir
+  file dest => [src, dir] do |t|
+    cp t.source, t.name
+  end
+  SOURCES.include dest
 end
 
-def shell(args, opts = {})
-  puts "> #{args.join(' ')}"
-  cmd, live_stream, cwd = args, opts[:live_stdout], opts[:cwd]
-  Dir.chdir(cwd) {
-    wait_thr = nil
+CLEAN.include SOURCES
+CLEAN.include FileList["ext/*.o", "ext/*.metal", "ext/whisper.{so,bundle,dll}"]
 
-    Open3.popen3(*cmd) do |stdin, stdout, stderr, thr|
-      stdin.close
-      wait_thr = thr # Ruby 1.8 will not yield thr, this will be nil
+task build: ["ext/Makefile", "ext/ruby_whisper.h", "ext/ruby_whisper.cpp", "whispercpp.gemspec"]
 
-      while line = stdout.gets do
-        live_stream.puts(line) if live_stream
-      end
-
-      while line = stderr.gets do
-        puts line
-      end
-    end
-
-    # prefer process handle directly from popen3, but if not available
-    # fallback to global.
-    p_status = wait_thr ? wait_thr.value : $?
-    exit_code = p_status.exitstatus
-    error = (exit_code != 0)
-  }
-end
+directory "pkg"
+CLOBBER.include "pkg"
 
-make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
-MAKECMD = ENV['MAKE_CMD'] || make_program
-MAKEOPTS = ENV['MAKE_OPTS'] || ''
-WHISPER_SO = "ext/whisper.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
+LIB_NAME = "whisper".ext(RbConfig::CONFIG["DLEXT"])
+SO_FILE = File.join("ext", LIB_NAME)
+LIB_FILE = File.join("lib", LIB_NAME)
 
-file 'ext/Makefile' => 'ext/extconf.rb' do
-  shell(['ruby', 'extconf.rb', ENV['EXTCONF_OPTS'].to_s],
-        { live_stdout: STDOUT, cwd: "#{Dir.pwd}/ext" }
-       )
+file "ext/Makefile" => ["ext/extconf.rb", "ext/ruby_whisper.h", "ext/ruby_whisper.cpp"] + SOURCES do |t|
+  Dir.chdir "ext" do
+    ruby "extconf.rb"
+  end
 end
 
-def make(target = '')
-  shell(["#{MAKECMD}", "#{MAKEOPTS}", "#{target}"].reject(&:empty?),
-        { live_stdout: STDOUT, cwd: "#{Dir.pwd}/ext" }
-       )
+file SO_FILE => "ext/Makefile" do |t|
+  Dir.chdir "ext" do
+    sh "make"
+  end
 end
+CLEAN.include SO_FILE
 
-# Let make handle dependencies between c/o/so - we'll just run it. 
-file WHISPER_SO => (['ext/Makefile'] + Dir['ext/*.cpp'] + Dir['ext/*.c'] + Dir['ext/*.h']) do
-  make
+directory "lib"
+file LIB_FILE => [SO_FILE, "lib"] do |t|
+  copy t.source, t.name
 end
+CLEAN.include LIB_FILE
 
-desc "Compile the shared object"
-task :compile => [WHISPER_SO]
-
-desc "Default Task (Test project)"
-task :default => :test
-
-Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['tests/test_*.rb']
-  t.verbose = false
+Rake::TestTask.new do |t|
+  t.test_files = FileList["tests/test_*.rb"]
 end
 
-desc 'Generate gem specification'
-task :gemspec do
-  system("cp ../../LICENSE .")
-  system("cp ../../README.md .")
-  tspec = ERB.new(File.read(File.join(File.dirname(__FILE__),'lib','whispercpp.gemspec.erb')))
-  File.open(File.join(File.dirname(__FILE__),'whispercpp.gemspec'),'wb') do|f|
-    f << tspec.result
+TEST_MEMORY_VIEW = "tests/jfk_reader/jfk_reader.#{RbConfig::CONFIG['DLEXT']}"
+file TEST_MEMORY_VIEW => "tests/jfk_reader/jfk_reader.c" do |t|
+  Dir.chdir "tests/jfk_reader" do
+    ruby "extconf.rb"
+    sh "make"
   end
 end
+CLEAN.include "tests/jfk_reader/jfk_reader.{o,#{RbConfig::CONFIG['DLEXT']}}"
 
-desc 'Build gem'
-task :package => :gemspec do
-  spec_source = File.read File.join(File.dirname(__FILE__),'whispercpp.gemspec')
-  spec = nil
-  # see: http://gist.github.com/16215
-  Thread.new { spec = eval("#{spec_source}") }.join
-  spec.validate
-  Gem::Package.build(spec)
-end
+task test: [LIB_FILE, TEST_MEMORY_VIEW]

data/ext/.gitignore

@@ -0,0 +1,13 @@
+Makefile
+whisper.so
+whisper.bundle
+whisper.dll
+scripts/get-flags.mk
+*.o
+*.c
+*.cpp
+*.h
+*.m
+*.metal
+!ruby_whisper.cpp
+!ruby_whisper.h

data/ext/cpu.mk

@@ -0,0 +1,9 @@
+ggml/src/ggml-cpu/ggml-cpu-cpp.o: \
+	ggml/src/ggml-cpu/ggml-cpu.cpp \
+	ggml/include/ggml-backend.h \
+	ggml/include/ggml.h \
+	ggml/include/ggml-alloc.h \
+	ggml/src/ggml-backend-impl.h \
+	ggml/include/ggml-cpu.h \
+	ggml/src/ggml-impl.h
+	$(CXX) $(CXXFLAGS)   -c $< -o $@