minor fixes post #87

Author: MikaelSlevinsky

.travis.yml

@@ -14,17 +14,9 @@ matrix:
     - julia: nightly
 addons:
   apt:
-    packages:
-      - libquadmath0
-      - libgomp1
-      - libopenblas-dev
-      - libfftw3-dev
-      - libmpfr-dev
+    packages: ['libquadmath0', 'libgomp1', 'libopenblas-dev', 'libfftw3-dev', 'libmpfr-dev']
   homebrew:
-    packages:
-      - gcc@8
-      - fftw
-      - mpfr
+    packages: ['gcc@8', 'fftw', 'mpfr']
     update: true
 
 notifications:

deps/build.jl

@@ -1,78 +1,68 @@
 using BinaryProvider
 import Libdl
 
-version = "0.2.7"
+version = v"0.2.8"
 
 if arch(platform_key_abi()) != :x86_64
     @warn "FastTransforms has only been tested on x86_64 architectures."
 end
-if !Sys.islinux() && !Sys.isapple()
-    error("Sorry ... unsupported OS. Feel free to file a PR to add support.")
-end
 
-const extension = Sys.isapple() ? "dylib" : "so"
+const extension = Sys.isapple() ? "dylib" : Sys.islinux() ? "so" : Sys.iswindows() ? "dll" : ""
+
 print_error() = error(
-    "FastTransforms could not be properly installed.\nCheck you have all dependencies installed." *
-   " To install the dependencies you can use:\n" *
-   "On Ubuntu / Debian \n" *
-   "   sudo apt install gcc libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n" *
-   "On MacOS \n" *
-   "   brew install gcc@8 fftw mpfr\n"
+    "FastTransforms could not be properly installed.\n Please check that you have all dependencies installed. " *
+    "Sample installation of dependencies:\n" *
+    print_platform_error(platform_key_abi())
 )
 
+print_platform_error(p::Platform) = "On $(BinaryProvider.platform_name(p)), please consider opening a pull request to add support.\n"
+print_platform_error(::MacOS) = "On MacOS\n\tbrew install gcc@8 fftw mpfr\n"
+print_plaftorm_error(::Linux) = "On Linux\n\tsudo apt-get install gcc-8 libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n"
+print_plaftorm_error(::Windows) = "On Windows\n\tvcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpir:x64-windows mpfr:x64-windows\n"
+
 # Rationale is as follows: The build is pretty fast, so on Linux it is typically easiest
 # to just use the gcc of the system to build the library and include it. On MacOS, however,
 # we need to actually install a gcc first, because Apple's OS comes only shipped with clang,
 # so here we download the binary.
 ft_build_from_source = get(ENV, "FT_BUILD_FROM_SOURCE", Sys.isapple() ? "false" : "true")
 if ft_build_from_source == "true"
-    println("Building from source.")
-
-    extra = Sys.isapple() ? "FT_USE_APPLEBLAS=1" : ""
+    extra = Sys.isapple() ? "FT_USE_APPLEBLAS=1" : Sys.iswindows() ? "FT_FFTW_WITH_COMBINED_THREADS=1" : ""
+    compiler = Sys.isapple() ? "CC=gcc-8" : "CC=gcc"
     script = """
         set -e
         set -x
-
         if [ -d "FastTransforms" ]; then
             cd FastTransforms
             git fetch
-            git reset --hard
-            git checkout -b v$version
+            git checkout v$version
             cd ..
         else
             git clone -b v$version https://github.com/MikaelSlevinsky/FastTransforms.git FastTransforms
         fi
-        ln -sf FastTransforms/libfasttransforms.$extension libfasttransforms.$extension
-
-        echo
-        echo
-
         cd FastTransforms
-        make clean
-        make lib $extra
+        make lib $compiler $extra
+        cd ..
+        mv -f FastTransforms/libfasttransforms.$extension libfasttransforms.$extension
     """
-
     try
         run(`/bin/bash -c $(script)`)
-    catch IOError
+    catch
         print_error()
     end
+    println("FastTransforms built from source.")
 else
-    println("Installing by downloading binaries.")
-
     const GCC = BinaryProvider.detect_compiler_abi().gcc_version
     namemap = Dict(:gcc4 => "gcc-4.9", :gcc5 => "gcc-5", :gcc6 => "gcc-6",
                    :gcc7 => "gcc-7", :gcc8 => "gcc-8", :gcc9 => "gcc-9")
     if !(GCC in keys(namemap))
         error("Please ensure you have a version of gcc from gcc-4.9 to gcc-9.")
     end
-    download("https://github.com/MikaelSlevinsky/FastTransforms/releases/download/" *
-             "v$version/libfasttransforms.v$version.$(namemap[GCC]).$extension",
-             joinpath(dirname(@__DIR__), "deps", "libfasttransforms.$extension"))
-end
-
-const lft_directiory = joinpath(dirname(@__DIR__), "deps")
-const libfasttransforms = Libdl.find_library("libfasttransforms", [lft_directiory])
-if libfasttransforms === nothing || length(libfasttransforms) == 0
-    print_error()
+    try
+        download("https://github.com/MikaelSlevinsky/FastTransforms/releases/download/" *
+                 "v$version/libfasttransforms.v$version.$(namemap[GCC]).$extension",
+                 joinpath(dirname(@__DIR__), "deps", "libfasttransforms.$extension"))
+    catch
+        print_error()
+    end
+    println("FastTransforms installed by downloading binaries.")
 end

src/libfasttransforms.jl

@@ -1,7 +1,6 @@
-const lft_directiory = joinpath(dirname(@__DIR__), "deps")
-const libfasttransforms = find_library("libfasttransforms", [lft_directiory])
+const libfasttransforms = find_library("libfasttransforms", [joinpath(dirname(@__DIR__), "deps")])
 
-if libfasttransforms === nothing || length(libfasttransforms) == 0
+if libfasttransforms ≡ nothing || length(libfasttransforms) == 0
     error("FastTransforms is not properly installed. Please run Pkg.build(\"FastTransforms\") ",
           "and restart Julia.")
 end