OpenMatriX 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec622f6548b7b7b28e605b4a68651c8499c3b39
-  data.tar.gz: 5efe8eb3fbdd801edb26879d2f8eb7bcae826dab
+  metadata.gz: d9756eb016b4fc012dea543550b67beaf6038102
+  data.tar.gz: 3e6b86681e09163cc8480bf180277ae60903cd6e
 SHA512:
-  metadata.gz: 3f6686191e9c169d315731161ff537f0481aac9229fd1426be5f9f514becca37d0575c05d96cc79a3901a42289df7292a997e8cd85e08c5a86984725f4d02c85
-  data.tar.gz: 07e97957246ec2f10d1bc3cca6ce81003d9fd0ed0532feab326a28e8986cc30b747aba10197c36edd87e20db1c685cd2e43518a51eac3fe812602a1baf87bd40
+  metadata.gz: 4593f8addcf7e95215217b837de8fe05358713e5be1c37196b4872e19da9d23db131880ae98c9c02ce7d6a7062b454b6c41e11b9ca01812d6aedb705f84f8198
+  data.tar.gz: 2156c6007e7a4717984da7c0499afc3be59592988464f770d757420e5075de5e0e388e2422a2df672746b54cd29b7ed4c86d48b81e595bb77240005477586776

data/Debian-HOWTO.md

@@ -1,11 +1,20 @@
 # Debian Installation and Use Howto
 
 This how-to MAY be applicable to other linux distros.  This was written while making stuff work
-on a Debian Jessie virtual machine that was upgraded from Debian Wheezy.
+on a Debian Jessie virtual machine that was upgraded from Debian Wheezy.  After realizing that
+the virtual machine had a 32-bit OS and there is an addressing error somewhere, an attempt was
+made to upgrade from 32-bit to 64-bit.  This did not go well and left the virtual machine in
+an entirely messed up state.  A new virtual machine was built with a fresh install of Debian
+Jessie (64-bit this time!) and all of these were reviewed and some revisions were made.
 
 # Prep
 
-First off, remove the included hdf5 distro.  You need 1.8.15, Jessie stable comes
+First off, make sure gcc, g++, and build-essentials are installed.
+```
+sudo apt-get install -y gcc g++ build-essentials
+```
+
+Second off, remove the included hdf5 distro if it exists.  You need 1.8.15, Jessie stable comes
 with 1.8.13.  And make sure you have 64 bit Debian.  THIS WILL NOT WORK WITH A
 32 BIT OPERATING SYSTEM.
 
@@ -13,7 +22,11 @@ with 1.8.13.  And make sure you have 64 bit Debian.  THIS WILL NOT WORK WITH A
 sudo apt-get remove libhdf5-dev
 ```
 
-Download the source for hdf5 ans szip from hdf5's webpage and un-tar it, compile, test, and install it:
+# HDF Library Installation
+
+Download the source for hdf5 and szip from hdf5's webpage and un-tar it, compile, test (optional, but highly recommended),
+and install it:
+
 ```
 wget http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz
 gunzip szip-2.1.tar.gz
@@ -22,6 +35,7 @@ rm szip-2.1.tar
 cd szip-2.1
 ./configure --prefix=/usr/local/hdf5
 make
+make check
 sudo make install
 
 wget http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.15-patch1.tar
@@ -46,11 +60,4 @@ Then, reload the linker:
 ```
 sudo ldconfig
 ```
-
-# Landing
-
-Install Ruby and Rails:
-```
-sudo apt-get install ruby
-sudo apt-get install rubygems
-gem install rails
+At this point, the gem should work

data/README.md

@@ -57,6 +57,11 @@ puts tt.getIJ(i,j) # Returns value at i,j
 file.close()
 ```
 
+## Linux Notes
+
+This has only been tested on Debian Jessie, and it MUST be a 64-bit version.  See
+the [howto](Debian-HOWTO.md).
+
 ## Important Concepts for Non-Travel-Modelers
 
 Note that our use of matrices may be a little different from others', and we

data/lib/OpenMatriX.rb

@@ -250,6 +250,9 @@ module OMX
       #ssize_t H5Lget_name_by_idx( hid_t loc_id, const char *group_name, H5_index_t index_field, H5_iter_order_t order, hsize_t n, char *name, size_t size, hid_t lapl_id )
       attach_function :tNames2, :H5Lget_name_by_idx, [H5Types.hid_t, :string, :int, :int, :int, :pointer, :int, :int ], :int
 
+      # hid_t H5Pcreate( hid_t cls_id )
+      attach_function :createpl, :H5Pcreate, [H5Types.hid_t], H5Types.hid_t64
+
       def initialize(file)
         @id = file.id
         @gId = gOpen(@id, "data",0)
@@ -267,19 +270,24 @@ module OMX
       def getTableNames()
         nT = self.getNTables()-1
         gName = FFI::MemoryPointer.new(:string)
-
-        pl = createpl(OMX::h5P_CLS_LINK_ACCESS_ID_g)
-
-        # Note from okiAndrew: this seems seriously kludgy, but it works.
+        #idxOrder = OMX::h5_INDEX_CRT_ORDER
+        #ii = OMX::h5_ITER_INC
+        puts "before pl"
+        puts "link access constant = #{OMX::h5P_CLS_LINK_ACCESS_ID}"
+        pl = createpl(OMX::h5P_CLS_LINK_ACCESS_ID)
+        puts "pl = #{pl}, pl.class = #{pl.class}"
         tN ||= []
         for t in 0..nT
-          tn2o = tNames2(@gId, ".", 0, t, 0, gName, 20, pl)
+          size = 1 + tNames2(@gId, ".", 0, 0, t, nil, 0, createpl(OMX::h5P_CLS_LINK_ACCESS_ID))
+          puts "size = #{size}"
+          tn2o = tNames2(@gId, ".", 0, 0, t, gName, size, pl)
           #puts "gName = #{gName.read_string()}"
           tN << gName.read_string()
         end
         return(tN)
       end
 
+
     end #class OMXTables
 
     #Class to read the data from the OMX file

data/lib/OpenMatriX/version.rb

@@ -1,3 +1,3 @@
 module OpenMatriX
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: OpenMatriX
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Rohne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler