Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleaned up lean mode build and test suite #1578

Merged
merged 1 commit into from
Sep 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMake/cdat_modules/uvcmetrics_pkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
set(UVCMETRICS_MD5)
set(UVCMETRICS_BRANCH uvcdat-2.2.0)

add_cdat_package(UVCMETRICS "" "" ON)
if (NOT CDAT_BUILD_LEAN)
add_cdat_package(UVCMETRICS "" "" ON)
endif()

1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ if (CDAT_BUILD_ESGF)
message(WARNING "[INFO] CDAT_BUILD_ESGF enabled, forcing CDAT_BUILD_MODE to LEAN")
endif()
set(CDAT_BUILD_MODE "LEAN" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>" FORCE)
set(CDAT_DOWNLOAD_SAMPLE_DATA OFF)
endif()
set(CDAT_BUILD_MODE "DEFAULT" CACHE STRING "Build mode for CDAT <ALL, LEAN, DEFAULT>")
set_property(CACHE CDAT_BUILD_MODE PROPERTY STRINGS "DEFAULT" "ALL" "LEAN")
Expand Down
7 changes: 5 additions & 2 deletions Packages/genutil/Lib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
"""
genutil -- General utility modules for scientific computing
"""
## Lean mode does not install xmgrace module
from grower import grower
import xmgrace
try:
import xmgrace
except:
pass
import statistics
from minmax import minmax
from statusbar import statusbar
Expand All @@ -14,7 +18,6 @@
from unidata import udunits
from Filler import Filler,StringConstructor
from averager import averager, AveragerError, area_weights, getAxisWeight, getAxisWeightByName,__check_weightoptions
#from Statusbar_Pmw import Statusbar
import cdat_info
from ASCII import get_parenthesis_content
cdat_info.pingPCMDIdb("cdat","genutil")
Expand Down
3 changes: 3 additions & 0 deletions installation/cdmsonly.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"Packages/Properties",
"Packages/kinds",
"Packages/cdms2",
"Packages/genutil",
"Packages/cdutil",
"Packages/unidata",
# "Packages/cdms",
"Packages/ncml",
"Packages/esg",
Expand Down
37 changes: 20 additions & 17 deletions testing/cdms2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,25 @@ cdat_add_test(cdms2_test_default_fill_value_not_nan
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_default_fill_value_not_nan.py
)
cdat_add_test("test_ascontiguous_regrid_nan_issue"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_ascontiguous_regrid_nan_issue.py
)
if (NOT CDAT_BUILD_LEAN)
cdat_add_test("test_ascontiguous_regrid_nan_issue"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_ascontiguous_regrid_nan_issue.py
)
endif()
cdat_add_test("test_dim_unlimited"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_dim_unlimited.py
TestCDATLite)
cdat_add_test("CDMS_Test_Zonal_regrid_Switch_to_Regrid2"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_regrid_zonal_switch_to_regrid2.py)
cdat_add_test("cdms2_test_createcopy_lose_dtype"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdms2_test_createcopy_lose_dtype.py
)
if (CDAT_DOWNLOAD_SAMPLE_DATA)
cdat_add_test("CDMS_Test_Zonal_regrid_Switch_to_Regrid2"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_regrid_zonal_switch_to_regrid2.py)
cdat_add_test("cdms2_test_createcopy_lose_dtype"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdms2_test_createcopy_lose_dtype.py
)
endif()
cdat_add_test("CDMS_Test_01"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdtest01.py)
Expand Down Expand Up @@ -84,9 +88,11 @@ cdat_add_test("CDMS_Test_16"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdtest16.py)

cdat_add_test("CDMS_Test_17"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdtest17.py)
if (CDAT_DOWNLOAD_SAMPLE_DATA)
cdat_add_test("CDMS_Test_17"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/cdtest17.py)
endif()

cdat_add_test("CDMS_Test_18"
"${PYTHON_EXECUTABLE}"
Expand All @@ -100,7 +106,6 @@ if(CDAT_DOWNLOAD_SAMPLE_DATA)
cdat_add_test("CDMS_Test_JSON"
"${PYTHON_EXECUTABLE}"
${cdat_SOURCE_DIR}/testing/cdms2/test_dump_load_jsn.py)

endif()

cdat_add_test("CDMS_Test_multiple_formats"
Expand Down Expand Up @@ -143,5 +148,3 @@ cdat_add_test("CDMS_Test_write_extended_dimension"

# Tests which should fail
# set_tests_properties(testSo2TasACCESSFails PROPERTIES PASS_REGULAR_EXPRESSION "FAILED")


1 change: 1 addition & 0 deletions testing/cdms2/test_isLatLonLevTim.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#Now quick tests for making it level
for u in ["Pa","hPa","psi","N/m2","N*m-2","kg*m-1*s-2","atm","bar","torr"]:
a.units = u
print u,a.isLevel()
assert(a.isLevel())
a.units=""
assert(not a.isLevel())
Expand Down