Changeset 3726


Ignore:
Timestamp:
Sep 21, 2015 9:25:17 AM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 958f206f6df804402f4ee8f607db53ba6d0f094b
end hash code: 326cd877a48ef0671024998e790a54426a642d1a

commit 326cd877a48ef0671024998e790a54426a642d1a
Author: Brad Bell <bradbell@…>
Date: Mon Sep 21 06:24:09 2015 -0700

Remove invisible white space.

commit fedd09eb68c3d5d92bba04334d36a233373c2b41
Author: Brad Bell <bradbell@…>
Date: Mon Sep 21 06:23:46 2015 -0700

Improve discussion of windows download and testing.

Location:
trunk/omh
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/omh/install/cmake_check.omh

    r3114 r3726  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
    6 the terms of the 
     6the terms of the
    77                    Eclipse Public License Version 1.0.
    88
     
    2424
    2525$head Purpose$$
    26 After you configure your system with the 
     26After you configure your system with the
    2727$cref/cmake command/cmake/CMake Command/$$ you
    28 can run the CppAD example and tests to make sure that 
     28can run the CppAD example and tests to make sure that
    2929CppAD functions properly on your system.
    3030
    3131
    3232$head Check All$$
    33 In the $code build$$ subdirectory of the 
     33In the $code build$$ subdirectory of the
    3434$cref/distribution directory/download/Distribution Directory/$$
    3535execute the command
     
    3939This will build and run all of the tests that are support
    4040by your system and the $cref cmake$$ command options.
     41
     42$subhead Windows$$
    4143If you created $code nmake$$ makefiles, you will have
    42 to use $code nmake$$ instead of $code make$$ in the command above; see
    43 the $cref/generator/cmake/generator/$$ option for the $code cmake$$ command.
     44to use $code nmake$$ instead of $code make$$ in the commands
     45above and below; see
     46$cref/windows file extraction and testing
     47        /download
     48        /Compressed Archives
     49        /Windows File Extraction and Testing
     50/$$.
    4451
    4552$head Subsets$$
    46 It is possible to build and run the following subsets of the 
     53It is possible to build and run the following subsets of the
    4754examples and tests:
    4855$table
    49 Command $cnext 
     56Command $cnext
    5057        Description
    5158$rnext
    52 $code make check_compare_c$$ $cnext 
    53         $tref compare_c$$ 
     59$code make check_compare_c$$ $cnext
     60        $tref compare_c$$
    5461$rnext
    55 $code make check_introduction$$   $cnext 
     62$code make check_introduction$$   $cnext
    5663        the programs in the $cref Introduction$$
    5764$rnext
    58 $code make check_example$$   $cnext 
     65$code make check_example$$   $cnext
    5966        most of the $cref Example$$ programs
    6067$rnext
    61 $code make check_print_for$$ $cnext 
     68$code make check_print_for$$ $cnext
    6269        the $cref PrintFor$$  command
    6370$rnext
    64 $code make check_test_more$$ $cnext 
    65         correctness tests that are not examples 
     71$code make check_test_more$$ $cnext
     72        correctness tests that are not examples
    6673$rnext
    67 $code make check_multi_thread$$ $cnext 
    68         $cref multi_thread$$ tests (run correctness only) 
     74$code make check_multi_thread$$ $cnext
     75        $cref multi_thread$$ tests (run correctness only)
    6976$rnext
    70 $code make check_speed$$ $cnext 
     77$code make check_speed$$ $cnext
    7178        single threading $cref speed$$ tests (run correctness only)
    7279$rnext
    73 $code make check_cppad_ipopt$$ $cnext 
     80$code make check_cppad_ipopt$$ $cnext
    7481        the $cref cppad_ipopt_nlp$$ speed and correctness tests
    7582$rnext
    7683$tend
    77  
     84
    7885
    7986$end
  • trunk/omh/install/download.omh

    r3692 r3726  
    1414$escape $$
    1515$spell
     16        vcdir
     17        vcvarsall
     18        Microsoft
     19        tarball
    1620        yyyy
    1721        mm
     
    132136%$$
    133137
    134 $subhead Windows File Extraction$$
     138$subhead Windows File Extraction and Testing$$
    135139If you know how to extract the distribution directory from
    136140the tar file, just do so. Otherwise, below is one way you can do it.
     
    142146$href%http://www.7-zip.org%$$.
    143147$lnext
    144 In a command window, use the command
    145 $codei%
    146         %path_to_7-zip%\7z x cppad-%version%.%lic%.tgz
    147 %$$
    148 where $icode path_to_7-zip$$ is the location where
    149 $code 7z.exe$$ was installed.
    150 $lnext
    151 Then execute the command
    152 $codei%
    153         %path_to_7-zip%\7z x cppad-%version%.%lic%.tar
     148Download and install the Visual Studio Express; for example
     149$href%http://www.microsoft.com/en-us/download/confirmation.aspx?id=44914
     150        %Visual Studio 2013
     151%$$
     152$lnext
     153In a command window, execute the following commands:
     154$codei%
     155        set PATH=%path_to_7_zip%;%PATH%
     156        set PATH=%path_to_cmake%;%PATH%
     157        set VCDIR=%path_to_vcdir%;%PATH%
     158        call "%VCDIR%\vcvarsall.bat" x86
     159%$$
     160For example, on one machine these paths had the following values:
     161$codei%
     162        %path_to_7_zip%=C:\Program Files\7-zip
     163        %path_to_cmake%=C:\Program Files (x86)\CMake\bin
     164        %path_to_vcdir%=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
     165%$$
     166$lnext
     167Use the following commands to extract the distribution from the tarball:
     168$codei%
     169        7z x cppad-%version%.%lic%.tgz
     170        7z x cppad-%version%.%lic%.tar
    154171%$$
    155172$lnext
     
    158175        cppad-%version%\cppad\cppad.hpp
    159176%$$
    160 In addition, you can try the following commands:
     177$lnext
     178The commands below are optional.
     179They run the CppAD tests using the default $cref cmake$$ settings
     180(except for the $cref/generator/cmake/generator/$$ option)
    161181$codei%
    162182        mkdir build
    163183        cd build
    164         %path_to_cmake%\cmake -G "NMake Makefiles" ..
    165         %path_to_nmake%\nmake check
     184        cmake -G "NMake Makefiles" ..
     185        nmake check
    166186%$$
    167187$lend
  • trunk/omh/whats_new/whats_new_15.omh

    r3725 r3726  
    6767assist you in learning about changes between various versions of CppAD.
    6868
     69$head 09-21$$
     70Improve discussion of
     71$cref/windows download and testing
     72        /download
     73        /Compressed Archives
     74        /Windows File Extraction and Testing
     75/$$.
     76
    6977$head 09-20$$
    7078$list number$$
Note: See TracChangeset for help on using the changeset viewer.